backport fixes for #2795 and 3481, update config.guess and config.sub. SDL-1.2
authorOzkan Sezer <sezeroz@gmail.com>
Sat, 13 Oct 2018 11:11:02 +0300
branchSDL-1.2
changeset 59785d1fcc58846
parent 475 0c88c81b59c9
child 598 12758bec1240
backport fixes for #2795 and 3481, update config.guess and config.sub.
Makefile.in
acinclude/libtool.m4
aclocal.m4
config.guess
config.sub
configure
configure.in
     1.1 --- a/Makefile.in	Wed May 27 10:49:02 2015 -0400
     1.2 +++ b/Makefile.in	Sat Oct 13 11:11:02 2018 +0300
     1.3 @@ -1,8 +1,9 @@
     1.4 -# Makefile.in generated by automake 1.10 from Makefile.am.
     1.5 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
     1.6  # @configure_input@
     1.7  
     1.8  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
     1.9 -# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
    1.10 +# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
    1.11 +# Inc.
    1.12  # This Makefile.in is free software; the Free Software Foundation
    1.13  # gives unlimited permission to copy and/or distribute it,
    1.14  # with or without modifications, as long as this notice is preserved.
    1.15 @@ -21,8 +22,9 @@
    1.16  
    1.17  VPATH = @srcdir@
    1.18  pkgdatadir = $(datadir)/@PACKAGE@
    1.19 +pkgincludedir = $(includedir)/@PACKAGE@
    1.20  pkglibdir = $(libdir)/@PACKAGE@
    1.21 -pkgincludedir = $(includedir)/@PACKAGE@
    1.22 +pkglibexecdir = $(libexecdir)/@PACKAGE@
    1.23  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
    1.24  install_sh_DATA = $(install_sh) -c -m 644
    1.25  install_sh_PROGRAM = $(install_sh) -c
    1.26 @@ -60,15 +62,30 @@
    1.27   configure.lineno config.status.lineno
    1.28  mkinstalldirs = $(install_sh) -d
    1.29  CONFIG_CLEAN_FILES = SDL_image.spec SDL_image.pc
    1.30 +CONFIG_CLEAN_VPATH_FILES =
    1.31  am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    1.32  am__vpath_adj = case $$p in \
    1.33      $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
    1.34      *) f=$$p;; \
    1.35    esac;
    1.36 -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
    1.37 +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
    1.38 +am__install_max = 40
    1.39 +am__nobase_strip_setup = \
    1.40 +  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
    1.41 +am__nobase_strip = \
    1.42 +  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
    1.43 +am__nobase_list = $(am__nobase_strip_setup); \
    1.44 +  for p in $$list; do echo "$$p $$p"; done | \
    1.45 +  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
    1.46 +  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
    1.47 +    if (++n[$$2] == $(am__install_max)) \
    1.48 +      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
    1.49 +    END { for (dir in files) print dir, files[dir] }'
    1.50 +am__base_list = \
    1.51 +  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
    1.52 +  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
    1.53  am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
    1.54  	"$(DESTDIR)$(libSDL_imageincludedir)"
    1.55 -libLTLIBRARIES_INSTALL = $(INSTALL)
    1.56  LTLIBRARIES = $(lib_LTLIBRARIES)
    1.57  am__DEPENDENCIES_1 =
    1.58  am__libSDL_image_la_SOURCES_DIST = IMG.c IMG_bmp.c IMG_gif.c IMG_jpg.c \
    1.59 @@ -90,6 +107,7 @@
    1.60  DEFAULT_INCLUDES = -I.@am__isrc@
    1.61  depcomp = $(SHELL) $(top_srcdir)/depcomp
    1.62  am__depfiles_maybe = depfiles
    1.63 +am__mv = mv -f
    1.64  COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
    1.65  	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
    1.66  LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
    1.67 @@ -110,9 +128,7 @@
    1.68  	$(LDFLAGS) -o $@
    1.69  SOURCES = $(libSDL_image_la_SOURCES) showimage.c
    1.70  DIST_SOURCES = $(am__libSDL_image_la_SOURCES_DIST) showimage.c
    1.71 -pkgconfigDATA_INSTALL = $(INSTALL_DATA)
    1.72  DATA = $(pkgconfig_DATA)
    1.73 -libSDL_imageincludeHEADERS_INSTALL = $(INSTALL_HEADER)
    1.74  HEADERS = $(libSDL_imageinclude_HEADERS)
    1.75  ETAGS = etags
    1.76  CTAGS = ctags
    1.77 @@ -120,9 +136,9 @@
    1.78  distdir = $(PACKAGE)-$(VERSION)
    1.79  top_distdir = $(distdir)
    1.80  am__remove_distdir = \
    1.81 -  { test ! -d $(distdir) \
    1.82 -    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
    1.83 -         && rm -fr $(distdir); }; }
    1.84 +  { test ! -d "$(distdir)" \
    1.85 +    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
    1.86 +         && rm -fr "$(distdir)"; }; }
    1.87  DIST_ARCHIVES = $(distdir).tar.gz
    1.88  GZIP_ENV = --best
    1.89  distuninstallcheck_listfiles = find . -type f -print
    1.90 @@ -260,6 +276,7 @@
    1.91  srcdir = @srcdir@
    1.92  sysconfdir = @sysconfdir@
    1.93  target_alias = @target_alias@
    1.94 +top_build_prefix = @top_build_prefix@
    1.95  top_builddir = @top_builddir@
    1.96  top_srcdir = @top_srcdir@
    1.97  lib_LTLIBRARIES = libSDL_image.la
    1.98 @@ -327,15 +344,15 @@
    1.99  	@for dep in $?; do \
   1.100  	  case '$(am__configure_deps)' in \
   1.101  	    *$$dep*) \
   1.102 -	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
   1.103 -	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
   1.104 +	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
   1.105 +	      $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
   1.106  		&& exit 0; \
   1.107  	      exit 1;; \
   1.108  	  esac; \
   1.109  	done; \
   1.110 -	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
   1.111 -	cd $(top_srcdir) && \
   1.112 -	  $(AUTOMAKE) --foreign  Makefile
   1.113 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
   1.114 +	$(am__cd) $(top_srcdir) && \
   1.115 +	  $(AUTOMAKE) --foreign Makefile
   1.116  .PRECIOUS: Makefile
   1.117  Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
   1.118  	@case '$?' in \
   1.119 @@ -351,9 +368,10 @@
   1.120  	$(SHELL) ./config.status --recheck
   1.121  
   1.122  $(top_srcdir)/configure:  $(am__configure_deps)
   1.123 -	cd $(srcdir) && $(AUTOCONF)
   1.124 +	$(am__cd) $(srcdir) && $(AUTOCONF)
   1.125  $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
   1.126 -	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   1.127 +	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
   1.128 +$(am__aclocal_m4_deps):
   1.129  SDL_image.spec: $(top_builddir)/config.status $(srcdir)/SDL_image.spec.in
   1.130  	cd $(top_builddir) && $(SHELL) ./config.status $@
   1.131  SDL_image.pc: $(top_builddir)/config.status $(srcdir)/SDL_image.pc.in
   1.132 @@ -361,20 +379,24 @@
   1.133  install-libLTLIBRARIES: $(lib_LTLIBRARIES)
   1.134  	@$(NORMAL_INSTALL)
   1.135  	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
   1.136 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
   1.137 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
   1.138 +	list2=; for p in $$list; do \
   1.139  	  if test -f $$p; then \
   1.140 -	    f=$(am__strip_dir) \
   1.141 -	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
   1.142 -	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
   1.143 +	    list2="$$list2 $$p"; \
   1.144  	  else :; fi; \
   1.145 -	done
   1.146 +	done; \
   1.147 +	test -z "$$list2" || { \
   1.148 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
   1.149 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
   1.150 +	}
   1.151  
   1.152  uninstall-libLTLIBRARIES:
   1.153  	@$(NORMAL_UNINSTALL)
   1.154 -	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
   1.155 -	  p=$(am__strip_dir) \
   1.156 -	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
   1.157 -	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
   1.158 +	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
   1.159 +	for p in $$list; do \
   1.160 +	  $(am__strip_dir) \
   1.161 +	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
   1.162 +	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
   1.163  	done
   1.164  
   1.165  clean-libLTLIBRARIES:
   1.166 @@ -389,11 +411,13 @@
   1.167  	$(libSDL_image_la_LINK) -rpath $(libdir) $(libSDL_image_la_OBJECTS) $(libSDL_image_la_LIBADD) $(LIBS)
   1.168  
   1.169  clean-noinstPROGRAMS:
   1.170 -	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
   1.171 -	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
   1.172 -	  echo " rm -f $$p $$f"; \
   1.173 -	  rm -f $$p $$f ; \
   1.174 -	done
   1.175 +	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
   1.176 +	echo " rm -f" $$list; \
   1.177 +	rm -f $$list || exit $$?; \
   1.178 +	test -n "$(EXEEXT)" || exit 0; \
   1.179 +	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
   1.180 +	echo " rm -f" $$list; \
   1.181 +	rm -f $$list
   1.182  showimage$(EXEEXT): $(showimage_OBJECTS) $(showimage_DEPENDENCIES) 
   1.183  	@rm -f showimage$(EXEEXT)
   1.184  	$(LINK) $(showimage_OBJECTS) $(showimage_LDADD) $(LIBS)
   1.185 @@ -423,42 +447,42 @@
   1.186  
   1.187  .c.o:
   1.188  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.189 -@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.190 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.191  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.192  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.193  @am__fastdepCC_FALSE@	$(COMPILE) -c $<
   1.194  
   1.195  .c.obj:
   1.196  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
   1.197 -@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.198 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.199  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.200  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.201  @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
   1.202  
   1.203  .c.lo:
   1.204  @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.205 -@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
   1.206 +@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
   1.207  @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
   1.208  @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.209  @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
   1.210  
   1.211  .m.o:
   1.212  @am__fastdepOBJC_TRUE@	$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.213 -@am__fastdepOBJC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.214 +@am__fastdepOBJC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.215  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.216  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.217  @am__fastdepOBJC_FALSE@	$(OBJCCOMPILE) -c -o $@ $<
   1.218  
   1.219  .m.obj:
   1.220  @am__fastdepOBJC_TRUE@	$(OBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
   1.221 -@am__fastdepOBJC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.222 +@am__fastdepOBJC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
   1.223  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
   1.224  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.225  @am__fastdepOBJC_FALSE@	$(OBJCCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
   1.226  
   1.227  .m.lo:
   1.228  @am__fastdepOBJC_TRUE@	$(LTOBJCCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
   1.229 -@am__fastdepOBJC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
   1.230 +@am__fastdepOBJC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
   1.231  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
   1.232  @AMDEP_TRUE@@am__fastdepOBJC_FALSE@	DEPDIR=$(DEPDIR) $(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
   1.233  @am__fastdepOBJC_FALSE@	$(LTOBJCCOMPILE) -c -o $@ $<
   1.234 @@ -470,93 +494,103 @@
   1.235  	-rm -rf .libs _libs
   1.236  
   1.237  distclean-libtool:
   1.238 -	-rm -f libtool
   1.239 +	-rm -f libtool config.lt
   1.240  install-pkgconfigDATA: $(pkgconfig_DATA)
   1.241  	@$(NORMAL_INSTALL)
   1.242  	test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
   1.243 -	@list='$(pkgconfig_DATA)'; for p in $$list; do \
   1.244 +	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
   1.245 +	for p in $$list; do \
   1.246  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
   1.247 -	  f=$(am__strip_dir) \
   1.248 -	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
   1.249 -	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
   1.250 +	  echo "$$d$$p"; \
   1.251 +	done | $(am__base_list) | \
   1.252 +	while read files; do \
   1.253 +	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \
   1.254 +	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \
   1.255  	done
   1.256  
   1.257  uninstall-pkgconfigDATA:
   1.258  	@$(NORMAL_UNINSTALL)
   1.259 -	@list='$(pkgconfig_DATA)'; for p in $$list; do \
   1.260 -	  f=$(am__strip_dir) \
   1.261 -	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
   1.262 -	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
   1.263 -	done
   1.264 +	@list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \
   1.265 +	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
   1.266 +	test -n "$$files" || exit 0; \
   1.267 +	echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \
   1.268 +	cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files
   1.269  install-libSDL_imageincludeHEADERS: $(libSDL_imageinclude_HEADERS)
   1.270  	@$(NORMAL_INSTALL)
   1.271  	test -z "$(libSDL_imageincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libSDL_imageincludedir)"
   1.272 -	@list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \
   1.273 +	@list='$(libSDL_imageinclude_HEADERS)'; test -n "$(libSDL_imageincludedir)" || list=; \
   1.274 +	for p in $$list; do \
   1.275  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
   1.276 -	  f=$(am__strip_dir) \
   1.277 -	  echo " $(libSDL_imageincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \
   1.278 -	  $(libSDL_imageincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \
   1.279 +	  echo "$$d$$p"; \
   1.280 +	done | $(am__base_list) | \
   1.281 +	while read files; do \
   1.282 +	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libSDL_imageincludedir)'"; \
   1.283 +	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libSDL_imageincludedir)" || exit $$?; \
   1.284  	done
   1.285  
   1.286  uninstall-libSDL_imageincludeHEADERS:
   1.287  	@$(NORMAL_UNINSTALL)
   1.288 -	@list='$(libSDL_imageinclude_HEADERS)'; for p in $$list; do \
   1.289 -	  f=$(am__strip_dir) \
   1.290 -	  echo " rm -f '$(DESTDIR)$(libSDL_imageincludedir)/$$f'"; \
   1.291 -	  rm -f "$(DESTDIR)$(libSDL_imageincludedir)/$$f"; \
   1.292 -	done
   1.293 +	@list='$(libSDL_imageinclude_HEADERS)'; test -n "$(libSDL_imageincludedir)" || list=; \
   1.294 +	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
   1.295 +	test -n "$$files" || exit 0; \
   1.296 +	echo " ( cd '$(DESTDIR)$(libSDL_imageincludedir)' && rm -f" $$files ")"; \
   1.297 +	cd "$(DESTDIR)$(libSDL_imageincludedir)" && rm -f $$files
   1.298  
   1.299  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
   1.300  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
   1.301  	unique=`for i in $$list; do \
   1.302  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.303  	  done | \
   1.304 -	  $(AWK) '    { files[$$0] = 1; } \
   1.305 -	       END { for (i in files) print i; }'`; \
   1.306 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.307 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.308  	mkid -fID $$unique
   1.309  tags: TAGS
   1.310  
   1.311  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.312  		$(TAGS_FILES) $(LISP)
   1.313 -	tags=; \
   1.314 +	set x; \
   1.315  	here=`pwd`; \
   1.316  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.317  	unique=`for i in $$list; do \
   1.318  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.319  	  done | \
   1.320 -	  $(AWK) '    { files[$$0] = 1; } \
   1.321 -	       END { for (i in files) print i; }'`; \
   1.322 -	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
   1.323 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.324 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.325 +	shift; \
   1.326 +	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
   1.327  	  test -n "$$unique" || unique=$$empty_fix; \
   1.328 -	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.329 -	    $$tags $$unique; \
   1.330 +	  if test $$# -gt 0; then \
   1.331 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.332 +	      "$$@" $$unique; \
   1.333 +	  else \
   1.334 +	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
   1.335 +	      $$unique; \
   1.336 +	  fi; \
   1.337  	fi
   1.338  ctags: CTAGS
   1.339  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
   1.340  		$(TAGS_FILES) $(LISP)
   1.341 -	tags=; \
   1.342 -	here=`pwd`; \
   1.343  	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
   1.344  	unique=`for i in $$list; do \
   1.345  	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
   1.346  	  done | \
   1.347 -	  $(AWK) '    { files[$$0] = 1; } \
   1.348 -	       END { for (i in files) print i; }'`; \
   1.349 -	test -z "$(CTAGS_ARGS)$$tags$$unique" \
   1.350 +	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
   1.351 +	      END { if (nonempty) { for (i in files) print i; }; }'`; \
   1.352 +	test -z "$(CTAGS_ARGS)$$unique" \
   1.353  	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
   1.354 -	     $$tags $$unique
   1.355 +	     $$unique
   1.356  
   1.357  GTAGS:
   1.358  	here=`$(am__cd) $(top_builddir) && pwd` \
   1.359 -	  && cd $(top_srcdir) \
   1.360 -	  && gtags -i $(GTAGS_ARGS) $$here
   1.361 +	  && $(am__cd) $(top_srcdir) \
   1.362 +	  && gtags -i $(GTAGS_ARGS) "$$here"
   1.363  
   1.364  distclean-tags:
   1.365  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
   1.366  
   1.367  distdir: $(DISTFILES)
   1.368  	$(am__remove_distdir)
   1.369 -	test -d $(distdir) || mkdir $(distdir)
   1.370 +	test -d "$(distdir)" || mkdir "$(distdir)"
   1.371  	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.372  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
   1.373  	list='$(DISTFILES)'; \
   1.374 @@ -572,21 +606,27 @@
   1.375  	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
   1.376  	  if test -d $$d/$$file; then \
   1.377  	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
   1.378 +	    if test -d "$(distdir)/$$file"; then \
   1.379 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.380 +	    fi; \
   1.381  	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
   1.382 -	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
   1.383 +	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
   1.384 +	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
   1.385  	    fi; \
   1.386 -	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
   1.387 +	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
   1.388  	  else \
   1.389 -	    test -f $(distdir)/$$file \
   1.390 -	    || cp -p $$d/$$file $(distdir)/$$file \
   1.391 +	    test -f "$(distdir)/$$file" \
   1.392 +	    || cp -p $$d/$$file "$(distdir)/$$file" \
   1.393  	    || exit 1; \
   1.394  	  fi; \
   1.395  	done
   1.396 -	-find $(distdir) -type d ! -perm -755 -exec chmod u+rwx,go+rx {} \; -o \
   1.397 +	-test -n "$(am__skip_mode_fix)" \
   1.398 +	|| find "$(distdir)" -type d ! -perm -755 \
   1.399 +		-exec chmod u+rwx,go+rx {} \; -o \
   1.400  	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
   1.401  	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
   1.402  	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
   1.403 -	|| chmod -R a+r $(distdir)
   1.404 +	|| chmod -R a+r "$(distdir)"
   1.405  dist-gzip: distdir
   1.406  	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
   1.407  	$(am__remove_distdir)
   1.408 @@ -595,6 +635,14 @@
   1.409  	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
   1.410  	$(am__remove_distdir)
   1.411  
   1.412 +dist-lzma: distdir
   1.413 +	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
   1.414 +	$(am__remove_distdir)
   1.415 +
   1.416 +dist-xz: distdir
   1.417 +	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
   1.418 +	$(am__remove_distdir)
   1.419 +
   1.420  dist-tarZ: distdir
   1.421  	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
   1.422  	$(am__remove_distdir)
   1.423 @@ -618,23 +666,29 @@
   1.424  distcheck: dist
   1.425  	case '$(DIST_ARCHIVES)' in \
   1.426  	*.tar.gz*) \
   1.427 -	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
   1.428 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
   1.429  	*.tar.bz2*) \
   1.430 -	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
   1.431 +	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
   1.432 +	*.tar.lzma*) \
   1.433 +	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
   1.434 +	*.tar.xz*) \
   1.435 +	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
   1.436  	*.tar.Z*) \
   1.437  	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
   1.438  	*.shar.gz*) \
   1.439 -	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
   1.440 +	  GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
   1.441  	*.zip*) \
   1.442  	  unzip $(distdir).zip ;;\
   1.443  	esac
   1.444 -	chmod -R a-w $(distdir); chmod a+w $(distdir)
   1.445 +	chmod -R a-w $(distdir); chmod u+w $(distdir)
   1.446  	mkdir $(distdir)/_build
   1.447  	mkdir $(distdir)/_inst
   1.448  	chmod a-w $(distdir)
   1.449 +	test -d $(distdir)/_build || exit 0; \
   1.450  	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
   1.451  	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
   1.452 -	  && cd $(distdir)/_build \
   1.453 +	  && am__cwd=`pwd` \
   1.454 +	  && $(am__cd) $(distdir)/_build \
   1.455  	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
   1.456  	    $(DISTCHECK_CONFIGURE_FLAGS) \
   1.457  	  && $(MAKE) $(AM_MAKEFLAGS) \
   1.458 @@ -656,13 +710,15 @@
   1.459  	  && rm -rf "$$dc_destdir" \
   1.460  	  && $(MAKE) $(AM_MAKEFLAGS) dist \
   1.461  	  && rm -rf $(DIST_ARCHIVES) \
   1.462 -	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
   1.463 +	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
   1.464 +	  && cd "$$am__cwd" \
   1.465 +	  || exit 1
   1.466  	$(am__remove_distdir)
   1.467  	@(echo "$(distdir) archives ready for distribution: "; \
   1.468  	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
   1.469  	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
   1.470  distuninstallcheck:
   1.471 -	@cd $(distuninstallcheck_dir) \
   1.472 +	@$(am__cd) '$(distuninstallcheck_dir)' \
   1.473  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
   1.474  	   || { echo "ERROR: files left after uninstall:" ; \
   1.475  	        if test -n "$(DESTDIR)"; then \
   1.476 @@ -706,6 +762,7 @@
   1.477  
   1.478  distclean-generic:
   1.479  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
   1.480 +	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
   1.481  
   1.482  maintainer-clean-generic:
   1.483  	@echo "This command is intended for maintainers to use"
   1.484 @@ -728,6 +785,8 @@
   1.485  
   1.486  html: html-am
   1.487  
   1.488 +html-am:
   1.489 +
   1.490  info: info-am
   1.491  
   1.492  info-am:
   1.493 @@ -737,18 +796,28 @@
   1.494  
   1.495  install-dvi: install-dvi-am
   1.496  
   1.497 +install-dvi-am:
   1.498 +
   1.499  install-exec-am: install-libLTLIBRARIES
   1.500  
   1.501  install-html: install-html-am
   1.502  
   1.503 +install-html-am:
   1.504 +
   1.505  install-info: install-info-am
   1.506  
   1.507 +install-info-am:
   1.508 +
   1.509  install-man:
   1.510  
   1.511  install-pdf: install-pdf-am
   1.512  
   1.513 +install-pdf-am:
   1.514 +
   1.515  install-ps: install-ps-am
   1.516  
   1.517 +install-ps-am:
   1.518 +
   1.519  installcheck-am:
   1.520  
   1.521  maintainer-clean: maintainer-clean-am
   1.522 @@ -779,21 +848,21 @@
   1.523  .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
   1.524  	clean-generic clean-libLTLIBRARIES clean-libtool \
   1.525  	clean-noinstPROGRAMS ctags dist dist-all dist-bzip2 dist-gzip \
   1.526 -	dist-shar dist-tarZ dist-zip distcheck distclean \
   1.527 -	distclean-compile distclean-generic distclean-libtool \
   1.528 -	distclean-tags distcleancheck distdir distuninstallcheck dvi \
   1.529 -	dvi-am html html-am info info-am install install-am \
   1.530 -	install-data install-data-am install-dvi install-dvi-am \
   1.531 -	install-exec install-exec-am install-html install-html-am \
   1.532 -	install-info install-info-am install-libLTLIBRARIES \
   1.533 -	install-libSDL_imageincludeHEADERS install-man install-pdf \
   1.534 -	install-pdf-am install-pkgconfigDATA install-ps install-ps-am \
   1.535 -	install-strip installcheck installcheck-am installdirs \
   1.536 -	maintainer-clean maintainer-clean-generic mostlyclean \
   1.537 -	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
   1.538 -	pdf pdf-am ps ps-am tags uninstall uninstall-am \
   1.539 -	uninstall-libLTLIBRARIES uninstall-libSDL_imageincludeHEADERS \
   1.540 -	uninstall-pkgconfigDATA
   1.541 +	dist-lzma dist-shar dist-tarZ dist-xz dist-zip distcheck \
   1.542 +	distclean distclean-compile distclean-generic \
   1.543 +	distclean-libtool distclean-tags distcleancheck distdir \
   1.544 +	distuninstallcheck dvi dvi-am html html-am info info-am \
   1.545 +	install install-am install-data install-data-am install-dvi \
   1.546 +	install-dvi-am install-exec install-exec-am install-html \
   1.547 +	install-html-am install-info install-info-am \
   1.548 +	install-libLTLIBRARIES install-libSDL_imageincludeHEADERS \
   1.549 +	install-man install-pdf install-pdf-am install-pkgconfigDATA \
   1.550 +	install-ps install-ps-am install-strip installcheck \
   1.551 +	installcheck-am installdirs maintainer-clean \
   1.552 +	maintainer-clean-generic mostlyclean mostlyclean-compile \
   1.553 +	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
   1.554 +	tags uninstall uninstall-am uninstall-libLTLIBRARIES \
   1.555 +	uninstall-libSDL_imageincludeHEADERS uninstall-pkgconfigDATA
   1.556  
   1.557  
   1.558  %.o : %.rc
   1.559 @@ -805,6 +874,7 @@
   1.560  # Rule to build RPM distribution package
   1.561  rpm: $(PACKAGE)-$(VERSION).tar.gz
   1.562  	rpmbuild -ta $(PACKAGE)-$(VERSION).tar.gz
   1.563 +
   1.564  # Tell versions [3.59,3.63) of GNU make to not export all variables.
   1.565  # Otherwise a system limit (for SysV at least) may be exceeded.
   1.566  .NOEXPORT:
     2.1 --- a/acinclude/libtool.m4	Wed May 27 10:49:02 2015 -0400
     2.2 +++ b/acinclude/libtool.m4	Sat Oct 13 11:11:02 2018 +0300
     2.3 @@ -1302,7 +1302,10 @@
     2.4  	  x86_64-*linux*)
     2.5  	    LD="${LD-ld} -m elf_x86_64"
     2.6  	    ;;
     2.7 -	  ppc*-*linux*|powerpc*-*linux*)
     2.8 +	  powerpc64le-*linux*)
     2.9 +	    LD="${LD-ld} -m elf64lppc"
    2.10 +	    ;;
    2.11 +	  powerpc64-*linux*)
    2.12  	    LD="${LD-ld} -m elf64ppc"
    2.13  	    ;;
    2.14  	  s390*-*linux*|s390*-*tpf*)
     3.1 --- a/aclocal.m4	Wed May 27 10:49:02 2015 -0400
     3.2 +++ b/aclocal.m4	Sat Oct 13 11:11:02 2018 +0300
     3.3 @@ -1,7 +1,7 @@
     3.4 -# generated automatically by aclocal 1.10 -*- Autoconf -*-
     3.5 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
     3.6  
     3.7  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
     3.8 -# 2005, 2006  Free Software Foundation, Inc.
     3.9 +# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
    3.10  # This file is free software; the Free Software Foundation
    3.11  # gives unlimited permission to copy and/or distribute it,
    3.12  # with or without modifications, as long as this notice is preserved.
    3.13 @@ -11,111 +11,15 @@
    3.14  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
    3.15  # PARTICULAR PURPOSE.
    3.16  
    3.17 -m4_if(m4_PACKAGE_VERSION, [2.61],,
    3.18 -[m4_fatal([this file was generated for autoconf 2.61.
    3.19 -You have another version of autoconf.  If you want to use that,
    3.20 -you should regenerate the build system entirely.], [63])])
    3.21 +m4_ifndef([AC_AUTOCONF_VERSION],
    3.22 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
    3.23 +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
    3.24 +[m4_warning([this file was generated for autoconf 2.63.
    3.25 +You have another version of autoconf.  It may work, but is not guaranteed to.
    3.26 +If you have problems, you may need to regenerate the build system entirely.
    3.27 +To do so, use the procedure documented by the package, typically `autoreconf'.])])
    3.28  
    3.29 -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
    3.30 -#
    3.31 -#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
    3.32 -#   Written by Scott James Remnant, 2004.
    3.33 -#
    3.34 -# This file is free software; the Free Software Foundation gives
    3.35 -# unlimited permission to copy and/or distribute it, with or without
    3.36 -# modifications, as long as this notice is preserved.
    3.37 -
    3.38 -# serial 5 lt~obsolete.m4
    3.39 -
    3.40 -# These exist entirely to fool aclocal when bootstrapping libtool.
    3.41 -#
    3.42 -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
    3.43 -# which have later been changed to m4_define as they aren't part of the
    3.44 -# exported API, or moved to Autoconf or Automake where they belong.
    3.45 -#
    3.46 -# The trouble is, aclocal is a bit thick.  It'll see the old AC_DEFUN
    3.47 -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us
    3.48 -# using a macro with the same name in our local m4/libtool.m4 it'll
    3.49 -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define
    3.50 -# and doesn't know about Autoconf macros at all.)
    3.51 -#
    3.52 -# So we provide this file, which has a silly filename so it's always
    3.53 -# included after everything else.  This provides aclocal with the
    3.54 -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
    3.55 -# because those macros already exist, or will be overwritten later.
    3.56 -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. 
    3.57 -#
    3.58 -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
    3.59 -# Yes, that means every name once taken will need to remain here until
    3.60 -# we give up compatibility with versions before 1.7, at which point
    3.61 -# we need to keep only those names which we still refer to.
    3.62 -
    3.63 -# This is to help aclocal find these macros, as it can't see m4_define.
    3.64 -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])])
    3.65 -
    3.66 -m4_ifndef([AC_LIBTOOL_LINKER_OPTION],	[AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])])
    3.67 -m4_ifndef([AC_PROG_EGREP],		[AC_DEFUN([AC_PROG_EGREP])])
    3.68 -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])])
    3.69 -m4_ifndef([_LT_AC_SHELL_INIT],		[AC_DEFUN([_LT_AC_SHELL_INIT])])
    3.70 -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX],	[AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])])
    3.71 -m4_ifndef([_LT_PROG_LTMAIN],		[AC_DEFUN([_LT_PROG_LTMAIN])])
    3.72 -m4_ifndef([_LT_AC_TAGVAR],		[AC_DEFUN([_LT_AC_TAGVAR])])
    3.73 -m4_ifndef([AC_LTDL_ENABLE_INSTALL],	[AC_DEFUN([AC_LTDL_ENABLE_INSTALL])])
    3.74 -m4_ifndef([AC_LTDL_PREOPEN],		[AC_DEFUN([AC_LTDL_PREOPEN])])
    3.75 -m4_ifndef([_LT_AC_SYS_COMPILER],	[AC_DEFUN([_LT_AC_SYS_COMPILER])])
    3.76 -m4_ifndef([_LT_AC_LOCK],		[AC_DEFUN([_LT_AC_LOCK])])
    3.77 -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE],	[AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])])
    3.78 -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF],	[AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])])
    3.79 -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O],	[AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])])
    3.80 -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])])
    3.81 -m4_ifndef([AC_LIBTOOL_OBJDIR],		[AC_DEFUN([AC_LIBTOOL_OBJDIR])])
    3.82 -m4_ifndef([AC_LTDL_OBJDIR],		[AC_DEFUN([AC_LTDL_OBJDIR])])
    3.83 -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])])
    3.84 -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP],	[AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])])
    3.85 -m4_ifndef([AC_PATH_MAGIC],		[AC_DEFUN([AC_PATH_MAGIC])])
    3.86 -m4_ifndef([AC_PROG_LD_GNU],		[AC_DEFUN([AC_PROG_LD_GNU])])
    3.87 -m4_ifndef([AC_PROG_LD_RELOAD_FLAG],	[AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])])
    3.88 -m4_ifndef([AC_DEPLIBS_CHECK_METHOD],	[AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])])
    3.89 -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])])
    3.90 -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])])
    3.91 -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])])
    3.92 -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS],	[AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])])
    3.93 -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP],	[AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])])
    3.94 -m4_ifndef([LT_AC_PROG_EGREP],		[AC_DEFUN([LT_AC_PROG_EGREP])])
    3.95 -m4_ifndef([LT_AC_PROG_SED],		[AC_DEFUN([LT_AC_PROG_SED])])
    3.96 -m4_ifndef([_LT_CC_BASENAME],		[AC_DEFUN([_LT_CC_BASENAME])])
    3.97 -m4_ifndef([_LT_COMPILER_BOILERPLATE],	[AC_DEFUN([_LT_COMPILER_BOILERPLATE])])
    3.98 -m4_ifndef([_LT_LINKER_BOILERPLATE],	[AC_DEFUN([_LT_LINKER_BOILERPLATE])])
    3.99 -m4_ifndef([_AC_PROG_LIBTOOL],		[AC_DEFUN([_AC_PROG_LIBTOOL])])
   3.100 -m4_ifndef([AC_LIBTOOL_SETUP],		[AC_DEFUN([AC_LIBTOOL_SETUP])])
   3.101 -m4_ifndef([_LT_AC_CHECK_DLFCN],		[AC_DEFUN([_LT_AC_CHECK_DLFCN])])
   3.102 -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER],	[AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])])
   3.103 -m4_ifndef([_LT_AC_TAGCONFIG],		[AC_DEFUN([_LT_AC_TAGCONFIG])])
   3.104 -m4_ifndef([AC_DISABLE_FAST_INSTALL],	[AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
   3.105 -m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
   3.106 -m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
   3.107 -m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
   3.108 -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
   3.109 -m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
   3.110 -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
   3.111 -m4_ifndef([_LT_AC_LANG_CXX_CONFIG],	[AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])])
   3.112 -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])])
   3.113 -m4_ifndef([_LT_AC_LANG_F77_CONFIG],	[AC_DEFUN([_LT_AC_LANG_F77_CONFIG])])
   3.114 -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])])
   3.115 -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG],	[AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])])
   3.116 -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
   3.117 -m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
   3.118 -m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
   3.119 -m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
   3.120 -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
   3.121 -m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
   3.122 -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
   3.123 -m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
   3.124 -m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
   3.125 -m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
   3.126 -m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
   3.127 -
   3.128 -# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
   3.129 +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
   3.130  #
   3.131  # This file is free software; the Free Software Foundation
   3.132  # gives unlimited permission to copy and/or distribute it,
   3.133 @@ -127,10 +31,10 @@
   3.134  # generated from the m4 files accompanying Automake X.Y.
   3.135  # (This private macro should not be called outside this file.)
   3.136  AC_DEFUN([AM_AUTOMAKE_VERSION],
   3.137 -[am__api_version='1.10'
   3.138 +[am__api_version='1.11'
   3.139  dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
   3.140  dnl require some minimum version.  Point them to the right macro.
   3.141 -m4_if([$1], [1.10], [],
   3.142 +m4_if([$1], [1.11.1], [],
   3.143        [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
   3.144  ])
   3.145  
   3.146 @@ -144,10 +48,12 @@
   3.147  # AM_SET_CURRENT_AUTOMAKE_VERSION
   3.148  # -------------------------------
   3.149  # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
   3.150 -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
   3.151 +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
   3.152  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
   3.153 -[AM_AUTOMAKE_VERSION([1.10])dnl
   3.154 -_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
   3.155 +[AM_AUTOMAKE_VERSION([1.11.1])dnl
   3.156 +m4_ifndef([AC_AUTOCONF_VERSION],
   3.157 +  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
   3.158 +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
   3.159  
   3.160  # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
   3.161  
   3.162 @@ -204,14 +110,14 @@
   3.163  
   3.164  # AM_CONDITIONAL                                            -*- Autoconf -*-
   3.165  
   3.166 -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
   3.167 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
   3.168  # Free Software Foundation, Inc.
   3.169  #
   3.170  # This file is free software; the Free Software Foundation
   3.171  # gives unlimited permission to copy and/or distribute it,
   3.172  # with or without modifications, as long as this notice is preserved.
   3.173  
   3.174 -# serial 8
   3.175 +# serial 9
   3.176  
   3.177  # AM_CONDITIONAL(NAME, SHELL-CONDITION)
   3.178  # -------------------------------------
   3.179 @@ -224,6 +130,7 @@
   3.180  AC_SUBST([$1_FALSE])dnl
   3.181  _AM_SUBST_NOTMAKE([$1_TRUE])dnl
   3.182  _AM_SUBST_NOTMAKE([$1_FALSE])dnl
   3.183 +m4_define([_AM_COND_VALUE_$1], [$2])dnl
   3.184  if $2; then
   3.185    $1_TRUE=
   3.186    $1_FALSE='#'
   3.187 @@ -237,14 +144,14 @@
   3.188  Usually this means the macro was only invoked conditionally.]])
   3.189  fi])])
   3.190  
   3.191 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
   3.192 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
   3.193  # Free Software Foundation, Inc.
   3.194  #
   3.195  # This file is free software; the Free Software Foundation
   3.196  # gives unlimited permission to copy and/or distribute it,
   3.197  # with or without modifications, as long as this notice is preserved.
   3.198  
   3.199 -# serial 9
   3.200 +# serial 10
   3.201  
   3.202  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
   3.203  # written in clear, in which case automake, when reading aclocal.m4,
   3.204 @@ -301,6 +208,16 @@
   3.205    if test "$am_compiler_list" = ""; then
   3.206       am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
   3.207    fi
   3.208 +  am__universal=false
   3.209 +  m4_case([$1], [CC],
   3.210 +    [case " $depcc " in #(
   3.211 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
   3.212 +     esac],
   3.213 +    [CXX],
   3.214 +    [case " $depcc " in #(
   3.215 +     *\ -arch\ *\ -arch\ *) am__universal=true ;;
   3.216 +     esac])
   3.217 +
   3.218    for depmode in $am_compiler_list; do
   3.219      # Setup a source with many dependencies, because some compilers
   3.220      # like to wrap large dependency lists on column 80 (with \), and
   3.221 @@ -318,7 +235,17 @@
   3.222      done
   3.223      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
   3.224  
   3.225 +    # We check with `-c' and `-o' for the sake of the "dashmstdout"
   3.226 +    # mode.  It turns out that the SunPro C++ compiler does not properly
   3.227 +    # handle `-M -o', and we need to detect this.  Also, some Intel
   3.228 +    # versions had trouble with output in subdirs
   3.229 +    am__obj=sub/conftest.${OBJEXT-o}
   3.230 +    am__minus_obj="-o $am__obj"
   3.231      case $depmode in
   3.232 +    gcc)
   3.233 +      # This depmode causes a compiler race in universal mode.
   3.234 +      test "$am__universal" = false || continue
   3.235 +      ;;
   3.236      nosideeffect)
   3.237        # after this tag, mechanisms are not by side-effect, so they'll
   3.238        # only be used when explicitly requested
   3.239 @@ -328,19 +255,23 @@
   3.240  	break
   3.241        fi
   3.242        ;;
   3.243 +    msvisualcpp | msvcmsys)
   3.244 +      # This compiler won't grok `-c -o', but also, the minuso test has
   3.245 +      # not run yet.  These depmodes are late enough in the game, and
   3.246 +      # so weak that their functioning should not be impacted.
   3.247 +      am__obj=conftest.${OBJEXT-o}
   3.248 +      am__minus_obj=
   3.249 +      ;;
   3.250      none) break ;;
   3.251      esac
   3.252 -    # We check with `-c' and `-o' for the sake of the "dashmstdout"
   3.253 -    # mode.  It turns out that the SunPro C++ compiler does not properly
   3.254 -    # handle `-M -o', and we need to detect this.
   3.255      if depmode=$depmode \
   3.256 -       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
   3.257 +       source=sub/conftest.c object=$am__obj \
   3.258         depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
   3.259 -       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
   3.260 +       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
   3.261           >/dev/null 2>conftest.err &&
   3.262         grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
   3.263         grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
   3.264 -       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
   3.265 +       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
   3.266         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
   3.267        # icc doesn't choke on unknown options, it will just issue warnings
   3.268        # or remarks (even with -Werror).  So we grep stderr for any message
   3.269 @@ -397,57 +328,68 @@
   3.270  
   3.271  # Generate code to set up dependency tracking.              -*- Autoconf -*-
   3.272  
   3.273 -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
   3.274 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
   3.275  # Free Software Foundation, Inc.
   3.276  #
   3.277  # This file is free software; the Free Software Foundation
   3.278  # gives unlimited permission to copy and/or distribute it,
   3.279  # with or without modifications, as long as this notice is preserved.
   3.280  
   3.281 -#serial 3
   3.282 +#serial 5
   3.283  
   3.284  # _AM_OUTPUT_DEPENDENCY_COMMANDS
   3.285  # ------------------------------
   3.286  AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   3.287 -[for mf in $CONFIG_FILES; do
   3.288 -  # Strip MF so we end up with the name of the file.
   3.289 -  mf=`echo "$mf" | sed -e 's/:.*$//'`
   3.290 -  # Check whether this is an Automake generated Makefile or not.
   3.291 -  # We used to match only the files named `Makefile.in', but
   3.292 -  # some people rename them; so instead we look at the file content.
   3.293 -  # Grep'ing the first line is not enough: some people post-process
   3.294 -  # each Makefile.in and add a new line on top of each file to say so.
   3.295 -  # Grep'ing the whole file is not good either: AIX grep has a line
   3.296 -  # limit of 2048, but all sed's we know have understand at least 4000.
   3.297 -  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
   3.298 -    dirpart=`AS_DIRNAME("$mf")`
   3.299 -  else
   3.300 -    continue
   3.301 -  fi
   3.302 -  # Extract the definition of DEPDIR, am__include, and am__quote
   3.303 -  # from the Makefile without running `make'.
   3.304 -  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   3.305 -  test -z "$DEPDIR" && continue
   3.306 -  am__include=`sed -n 's/^am__include = //p' < "$mf"`
   3.307 -  test -z "am__include" && continue
   3.308 -  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   3.309 -  # When using ansi2knr, U may be empty or an underscore; expand it
   3.310 -  U=`sed -n 's/^U = //p' < "$mf"`
   3.311 -  # Find all dependency output files, they are included files with
   3.312 -  # $(DEPDIR) in their names.  We invoke sed twice because it is the
   3.313 -  # simplest approach to changing $(DEPDIR) to its actual value in the
   3.314 -  # expansion.
   3.315 -  for file in `sed -n "
   3.316 -    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
   3.317 -       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
   3.318 -    # Make sure the directory exists.
   3.319 -    test -f "$dirpart/$file" && continue
   3.320 -    fdir=`AS_DIRNAME(["$file"])`
   3.321 -    AS_MKDIR_P([$dirpart/$fdir])
   3.322 -    # echo "creating $dirpart/$file"
   3.323 -    echo '# dummy' > "$dirpart/$file"
   3.324 +[{
   3.325 +  # Autoconf 2.62 quotes --file arguments for eval, but not when files
   3.326 +  # are listed without --file.  Let's play safe and only enable the eval
   3.327 +  # if we detect the quoting.
   3.328 +  case $CONFIG_FILES in
   3.329 +  *\'*) eval set x "$CONFIG_FILES" ;;
   3.330 +  *)   set x $CONFIG_FILES ;;
   3.331 +  esac
   3.332 +  shift
   3.333 +  for mf
   3.334 +  do
   3.335 +    # Strip MF so we end up with the name of the file.
   3.336 +    mf=`echo "$mf" | sed -e 's/:.*$//'`
   3.337 +    # Check whether this is an Automake generated Makefile or not.
   3.338 +    # We used to match only the files named `Makefile.in', but
   3.339 +    # some people rename them; so instead we look at the file content.
   3.340 +    # Grep'ing the first line is not enough: some people post-process
   3.341 +    # each Makefile.in and add a new line on top of each file to say so.
   3.342 +    # Grep'ing the whole file is not good either: AIX grep has a line
   3.343 +    # limit of 2048, but all sed's we know have understand at least 4000.
   3.344 +    if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
   3.345 +      dirpart=`AS_DIRNAME("$mf")`
   3.346 +    else
   3.347 +      continue
   3.348 +    fi
   3.349 +    # Extract the definition of DEPDIR, am__include, and am__quote
   3.350 +    # from the Makefile without running `make'.
   3.351 +    DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
   3.352 +    test -z "$DEPDIR" && continue
   3.353 +    am__include=`sed -n 's/^am__include = //p' < "$mf"`
   3.354 +    test -z "am__include" && continue
   3.355 +    am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
   3.356 +    # When using ansi2knr, U may be empty or an underscore; expand it
   3.357 +    U=`sed -n 's/^U = //p' < "$mf"`
   3.358 +    # Find all dependency output files, they are included files with
   3.359 +    # $(DEPDIR) in their names.  We invoke sed twice because it is the
   3.360 +    # simplest approach to changing $(DEPDIR) to its actual value in the
   3.361 +    # expansion.
   3.362 +    for file in `sed -n "
   3.363 +      s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
   3.364 +	 sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
   3.365 +      # Make sure the directory exists.
   3.366 +      test -f "$dirpart/$file" && continue
   3.367 +      fdir=`AS_DIRNAME(["$file"])`
   3.368 +      AS_MKDIR_P([$dirpart/$fdir])
   3.369 +      # echo "creating $dirpart/$file"
   3.370 +      echo '# dummy' > "$dirpart/$file"
   3.371 +    done
   3.372    done
   3.373 -done
   3.374 +}
   3.375  ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
   3.376  
   3.377  
   3.378 @@ -467,13 +409,13 @@
   3.379  # Do all the work for Automake.                             -*- Autoconf -*-
   3.380  
   3.381  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
   3.382 -# 2005, 2006 Free Software Foundation, Inc.
   3.383 +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
   3.384  #
   3.385  # This file is free software; the Free Software Foundation
   3.386  # gives unlimited permission to copy and/or distribute it,
   3.387  # with or without modifications, as long as this notice is preserved.
   3.388  
   3.389 -# serial 12
   3.390 +# serial 16
   3.391  
   3.392  # This macro actually does too much.  Some checks are only needed if
   3.393  # your package does certain things.  But this isn't really a big deal.
   3.394 @@ -490,7 +432,7 @@
   3.395  # arguments mandatory, and then we can depend on a new Autoconf
   3.396  # release and drop the old call support.
   3.397  AC_DEFUN([AM_INIT_AUTOMAKE],
   3.398 -[AC_PREREQ([2.60])dnl
   3.399 +[AC_PREREQ([2.62])dnl
   3.400  dnl Autoconf wants to disallow AM_ names.  We explicitly allow
   3.401  dnl the ones we care about.
   3.402  m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
   3.403 @@ -541,8 +483,8 @@
   3.404  AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
   3.405  AM_MISSING_PROG(AUTOHEADER, autoheader)
   3.406  AM_MISSING_PROG(MAKEINFO, makeinfo)
   3.407 -AM_PROG_INSTALL_SH
   3.408 -AM_PROG_INSTALL_STRIP
   3.409 +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
   3.410 +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
   3.411  AC_REQUIRE([AM_PROG_MKDIR_P])dnl
   3.412  # We need awk for the "check" target.  The system "awk" is bad on
   3.413  # some platforms.
   3.414 @@ -550,24 +492,37 @@
   3.415  AC_REQUIRE([AC_PROG_MAKE_SET])dnl
   3.416  AC_REQUIRE([AM_SET_LEADING_DOT])dnl
   3.417  _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
   3.418 -              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
   3.419 -	      		     [_AM_PROG_TAR([v7])])])
   3.420 +	      [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
   3.421 +			     [_AM_PROG_TAR([v7])])])
   3.422  _AM_IF_OPTION([no-dependencies],,
   3.423  [AC_PROVIDE_IFELSE([AC_PROG_CC],
   3.424 -                  [_AM_DEPENDENCIES(CC)],
   3.425 -                  [define([AC_PROG_CC],
   3.426 -                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
   3.427 +		  [_AM_DEPENDENCIES(CC)],
   3.428 +		  [define([AC_PROG_CC],
   3.429 +			  defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
   3.430  AC_PROVIDE_IFELSE([AC_PROG_CXX],
   3.431 -                  [_AM_DEPENDENCIES(CXX)],
   3.432 -                  [define([AC_PROG_CXX],
   3.433 -                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
   3.434 +		  [_AM_DEPENDENCIES(CXX)],
   3.435 +		  [define([AC_PROG_CXX],
   3.436 +			  defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
   3.437  AC_PROVIDE_IFELSE([AC_PROG_OBJC],
   3.438 -                  [_AM_DEPENDENCIES(OBJC)],
   3.439 -                  [define([AC_PROG_OBJC],
   3.440 -                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
   3.441 +		  [_AM_DEPENDENCIES(OBJC)],
   3.442 +		  [define([AC_PROG_OBJC],
   3.443 +			  defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
   3.444  ])
   3.445 +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
   3.446 +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
   3.447 +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen.  This macro
   3.448 +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
   3.449 +AC_CONFIG_COMMANDS_PRE(dnl
   3.450 +[m4_provide_if([_AM_COMPILER_EXEEXT],
   3.451 +  [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
   3.452  ])
   3.453  
   3.454 +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
   3.455 +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
   3.456 +dnl mangled by Autoconf and run in a shell conditional statement.
   3.457 +m4_define([_AC_COMPILER_EXEEXT],
   3.458 +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
   3.459 +
   3.460  
   3.461  # When config.status generates a header, we must update the stamp-h file.
   3.462  # This file resides in the same directory as the config header
   3.463 @@ -578,18 +533,19 @@
   3.464  # our stamp files there.
   3.465  AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
   3.466  [# Compute $1's index in $config_headers.
   3.467 +_am_arg=$1
   3.468  _am_stamp_count=1
   3.469  for _am_header in $config_headers :; do
   3.470    case $_am_header in
   3.471 -    $1 | $1:* )
   3.472 +    $_am_arg | $_am_arg:* )
   3.473        break ;;
   3.474      * )
   3.475        _am_stamp_count=`expr $_am_stamp_count + 1` ;;
   3.476    esac
   3.477  done
   3.478 -echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
   3.479 +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
   3.480  
   3.481 -# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
   3.482 +# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
   3.483  #
   3.484  # This file is free software; the Free Software Foundation
   3.485  # gives unlimited permission to copy and/or distribute it,
   3.486 @@ -600,7 +556,14 @@
   3.487  # Define $install_sh.
   3.488  AC_DEFUN([AM_PROG_INSTALL_SH],
   3.489  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   3.490 -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
   3.491 +if test x"${install_sh}" != xset; then
   3.492 +  case $am_aux_dir in
   3.493 +  *\ * | *\	*)
   3.494 +    install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
   3.495 +  *)
   3.496 +    install_sh="\${SHELL} $am_aux_dir/install-sh"
   3.497 +  esac
   3.498 +fi
   3.499  AC_SUBST(install_sh)])
   3.500  
   3.501  # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
   3.502 @@ -626,13 +589,13 @@
   3.503  
   3.504  # Check to see how 'make' treats includes.	            -*- Autoconf -*-
   3.505  
   3.506 -# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
   3.507 +# Copyright (C) 2001, 2002, 2003, 2005, 2009  Free Software Foundation, Inc.
   3.508  #
   3.509  # This file is free software; the Free Software Foundation
   3.510  # gives unlimited permission to copy and/or distribute it,
   3.511  # with or without modifications, as long as this notice is preserved.
   3.512  
   3.513 -# serial 3
   3.514 +# serial 4
   3.515  
   3.516  # AM_MAKE_INCLUDE()
   3.517  # -----------------
   3.518 @@ -641,7 +604,7 @@
   3.519  [am_make=${MAKE-make}
   3.520  cat > confinc << 'END'
   3.521  am__doit:
   3.522 -	@echo done
   3.523 +	@echo this is the am__doit target
   3.524  .PHONY: am__doit
   3.525  END
   3.526  # If we don't find an include directive, just comment out the code.
   3.527 @@ -651,24 +614,24 @@
   3.528  _am_result=none
   3.529  # First try GNU make style include.
   3.530  echo "include confinc" > confmf
   3.531 -# We grep out `Entering directory' and `Leaving directory'
   3.532 -# messages which can occur if `w' ends up in MAKEFLAGS.
   3.533 -# In particular we don't look at `^make:' because GNU make might
   3.534 -# be invoked under some other name (usually "gmake"), in which
   3.535 -# case it prints its new name instead of `make'.
   3.536 -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
   3.537 -   am__include=include
   3.538 -   am__quote=
   3.539 -   _am_result=GNU
   3.540 -fi
   3.541 +# Ignore all kinds of additional output from `make'.
   3.542 +case `$am_make -s -f confmf 2> /dev/null` in #(
   3.543 +*the\ am__doit\ target*)
   3.544 +  am__include=include
   3.545 +  am__quote=
   3.546 +  _am_result=GNU
   3.547 +  ;;
   3.548 +esac
   3.549  # Now try BSD make style include.
   3.550  if test "$am__include" = "#"; then
   3.551     echo '.include "confinc"' > confmf
   3.552 -   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
   3.553 -      am__include=.include
   3.554 -      am__quote="\""
   3.555 -      _am_result=BSD
   3.556 -   fi
   3.557 +   case `$am_make -s -f confmf 2> /dev/null` in #(
   3.558 +   *the\ am__doit\ target*)
   3.559 +     am__include=.include
   3.560 +     am__quote="\""
   3.561 +     _am_result=BSD
   3.562 +     ;;
   3.563 +   esac
   3.564  fi
   3.565  AC_SUBST([am__include])
   3.566  AC_SUBST([am__quote])
   3.567 @@ -678,14 +641,14 @@
   3.568  
   3.569  # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
   3.570  
   3.571 -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
   3.572 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
   3.573  # Free Software Foundation, Inc.
   3.574  #
   3.575  # This file is free software; the Free Software Foundation
   3.576  # gives unlimited permission to copy and/or distribute it,
   3.577  # with or without modifications, as long as this notice is preserved.
   3.578  
   3.579 -# serial 5
   3.580 +# serial 6
   3.581  
   3.582  # AM_MISSING_PROG(NAME, PROGRAM)
   3.583  # ------------------------------
   3.584 @@ -702,7 +665,14 @@
   3.585  AC_DEFUN([AM_MISSING_HAS_RUN],
   3.586  [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
   3.587  AC_REQUIRE_AUX_FILE([missing])dnl
   3.588 -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
   3.589 +if test x"${MISSING+set}" != xset; then
   3.590 +  case $am_aux_dir in
   3.591 +  *\ * | *\	*)
   3.592 +    MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
   3.593 +  *)
   3.594 +    MISSING="\${SHELL} $am_aux_dir/missing" ;;
   3.595 +  esac
   3.596 +fi
   3.597  # Use eval to expand $SHELL
   3.598  if eval "$MISSING --run true"; then
   3.599    am_missing_run="$MISSING --run "
   3.600 @@ -740,13 +710,13 @@
   3.601  
   3.602  # Helper functions for option handling.                     -*- Autoconf -*-
   3.603  
   3.604 -# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
   3.605 +# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
   3.606  #
   3.607  # This file is free software; the Free Software Foundation
   3.608  # gives unlimited permission to copy and/or distribute it,
   3.609  # with or without modifications, as long as this notice is preserved.
   3.610  
   3.611 -# serial 3
   3.612 +# serial 4
   3.613  
   3.614  # _AM_MANGLE_OPTION(NAME)
   3.615  # -----------------------
   3.616 @@ -763,7 +733,7 @@
   3.617  # ----------------------------------
   3.618  # OPTIONS is a space-separated list of Automake options.
   3.619  AC_DEFUN([_AM_SET_OPTIONS],
   3.620 -[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
   3.621 +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
   3.622  
   3.623  # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
   3.624  # -------------------------------------------
   3.625 @@ -773,14 +743,14 @@
   3.626  
   3.627  # Check to make sure that the build environment is sane.    -*- Autoconf -*-
   3.628  
   3.629 -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
   3.630 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
   3.631  # Free Software Foundation, Inc.
   3.632  #
   3.633  # This file is free software; the Free Software Foundation
   3.634  # gives unlimited permission to copy and/or distribute it,
   3.635  # with or without modifications, as long as this notice is preserved.
   3.636  
   3.637 -# serial 4
   3.638 +# serial 5
   3.639  
   3.640  # AM_SANITY_CHECK
   3.641  # ---------------
   3.642 @@ -789,16 +759,29 @@
   3.643  # Just in case
   3.644  sleep 1
   3.645  echo timestamp > conftest.file
   3.646 +# Reject unsafe characters in $srcdir or the absolute working directory
   3.647 +# name.  Accept space and tab only in the latter.
   3.648 +am_lf='
   3.649 +'
   3.650 +case `pwd` in
   3.651 +  *[[\\\"\#\$\&\'\`$am_lf]]*)
   3.652 +    AC_MSG_ERROR([unsafe absolute working directory name]);;
   3.653 +esac
   3.654 +case $srcdir in
   3.655 +  *[[\\\"\#\$\&\'\`$am_lf\ \	]]*)
   3.656 +    AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
   3.657 +esac
   3.658 +
   3.659  # Do `set' in a subshell so we don't clobber the current shell's
   3.660  # arguments.  Must try -L first in case configure is actually a
   3.661  # symlink; some systems play weird games with the mod time of symlinks
   3.662  # (eg FreeBSD returns the mod time of the symlink's containing
   3.663  # directory).
   3.664  if (
   3.665 -   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
   3.666 +   set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
   3.667     if test "$[*]" = "X"; then
   3.668        # -L didn't work.
   3.669 -      set X `ls -t $srcdir/configure conftest.file`
   3.670 +      set X `ls -t "$srcdir/configure" conftest.file`
   3.671     fi
   3.672     rm -f conftest.file
   3.673     if test "$[*]" != "X $srcdir/configure conftest.file" \
   3.674 @@ -851,18 +834,25 @@
   3.675  INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
   3.676  AC_SUBST([INSTALL_STRIP_PROGRAM])])
   3.677  
   3.678 -# Copyright (C) 2006  Free Software Foundation, Inc.
   3.679 +# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
   3.680  #
   3.681  # This file is free software; the Free Software Foundation
   3.682  # gives unlimited permission to copy and/or distribute it,
   3.683  # with or without modifications, as long as this notice is preserved.
   3.684  
   3.685 +# serial 2
   3.686 +
   3.687  # _AM_SUBST_NOTMAKE(VARIABLE)
   3.688  # ---------------------------
   3.689 -# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
   3.690 +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
   3.691  # This macro is traced by Automake.
   3.692  AC_DEFUN([_AM_SUBST_NOTMAKE])
   3.693  
   3.694 +# AM_SUBST_NOTMAKE(VARIABLE)
   3.695 +# ---------------------------
   3.696 +# Public sister of _AM_SUBST_NOTMAKE.
   3.697 +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
   3.698 +
   3.699  # Check how to create a tarball.                            -*- Autoconf -*-
   3.700  
   3.701  # Copyright (C) 2004, 2005  Free Software Foundation, Inc.
     4.1 --- a/config.guess	Wed May 27 10:49:02 2015 -0400
     4.2 +++ b/config.guess	Sat Oct 13 11:11:02 2018 +0300
     4.3 @@ -1,14 +1,12 @@
     4.4  #! /bin/sh
     4.5  # Attempt to guess a canonical system name.
     4.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     4.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     4.8 -#   Free Software Foundation, Inc.
     4.9 +#   Copyright 1992-2017 Free Software Foundation, Inc.
    4.10  
    4.11 -timestamp='2009-09-18'
    4.12 +timestamp='2017-08-08'
    4.13  
    4.14  # This file is free software; you can redistribute it and/or modify it
    4.15  # under the terms of the GNU General Public License as published by
    4.16 -# the Free Software Foundation; either version 2 of the License, or
    4.17 +# the Free Software Foundation; either version 3 of the License, or
    4.18  # (at your option) any later version.
    4.19  #
    4.20  # This program is distributed in the hope that it will be useful, but
    4.21 @@ -17,26 +15,22 @@
    4.22  # General Public License for more details.
    4.23  #
    4.24  # You should have received a copy of the GNU General Public License
    4.25 -# along with this program; if not, write to the Free Software
    4.26 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    4.27 -# 02110-1301, USA.
    4.28 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    4.29  #
    4.30  # As a special exception to the GNU General Public License, if you
    4.31  # distribute this file as part of a program that contains a
    4.32  # configuration script generated by Autoconf, you may include it under
    4.33 -# the same distribution terms that you use for the rest of that program.
    4.34 -
    4.35 -
    4.36 -# Originally written by Per Bothner.  Please send patches (context
    4.37 -# diff format) to <config-patches@gnu.org> and include a ChangeLog
    4.38 -# entry.
    4.39 +# the same distribution terms that you use for the rest of that
    4.40 +# program.  This Exception is an additional permission under section 7
    4.41 +# of the GNU General Public License, version 3 ("GPLv3").
    4.42  #
    4.43 -# This script attempts to guess a canonical system name similar to
    4.44 -# config.sub.  If it succeeds, it prints the system name on stdout, and
    4.45 -# exits with 0.  Otherwise, it exits with 1.
    4.46 +# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
    4.47  #
    4.48  # You can get the latest version of this script from:
    4.49 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
    4.50 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
    4.51 +#
    4.52 +# Please send patches to <config-patches@gnu.org>.
    4.53 +
    4.54  
    4.55  me=`echo "$0" | sed -e 's,.*/,,'`
    4.56  
    4.57 @@ -56,8 +50,7 @@
    4.58  GNU config.guess ($timestamp)
    4.59  
    4.60  Originally written by Per Bothner.
    4.61 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    4.62 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    4.63 +Copyright 1992-2017 Free Software Foundation, Inc.
    4.64  
    4.65  This is free software; see the source for copying conditions.  There is NO
    4.66  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    4.67 @@ -139,12 +132,33 @@
    4.68  UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
    4.69  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    4.70  
    4.71 +case "${UNAME_SYSTEM}" in
    4.72 +Linux|GNU|GNU/*)
    4.73 +	# If the system lacks a compiler, then just pick glibc.
    4.74 +	# We could probably try harder.
    4.75 +	LIBC=gnu
    4.76 +
    4.77 +	eval $set_cc_for_build
    4.78 +	cat <<-EOF > $dummy.c
    4.79 +	#include <features.h>
    4.80 +	#if defined(__UCLIBC__)
    4.81 +	LIBC=uclibc
    4.82 +	#elif defined(__dietlibc__)
    4.83 +	LIBC=dietlibc
    4.84 +	#else
    4.85 +	LIBC=gnu
    4.86 +	#endif
    4.87 +	EOF
    4.88 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
    4.89 +	;;
    4.90 +esac
    4.91 +
    4.92  # Note: order is significant - the case branches are not exclusive.
    4.93  
    4.94  case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
    4.95      *:NetBSD:*:*)
    4.96  	# NetBSD (nbsd) targets should (where applicable) match one or
    4.97 -	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
    4.98 +	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
    4.99  	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
   4.100  	# switched to ELF, *-*-netbsd* would select the old
   4.101  	# object file format.  This provides both forward
   4.102 @@ -154,19 +168,29 @@
   4.103  	# Note: NetBSD doesn't particularly care about the vendor
   4.104  	# portion of the name.  We always set it to "unknown".
   4.105  	sysctl="sysctl -n hw.machine_arch"
   4.106 -	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
   4.107 -	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
   4.108 +	UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \
   4.109 +	    /sbin/$sysctl 2>/dev/null || \
   4.110 +	    /usr/sbin/$sysctl 2>/dev/null || \
   4.111 +	    echo unknown)`
   4.112  	case "${UNAME_MACHINE_ARCH}" in
   4.113  	    armeb) machine=armeb-unknown ;;
   4.114  	    arm*) machine=arm-unknown ;;
   4.115  	    sh3el) machine=shl-unknown ;;
   4.116  	    sh3eb) machine=sh-unknown ;;
   4.117  	    sh5el) machine=sh5le-unknown ;;
   4.118 +	    earmv*)
   4.119 +		arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
   4.120 +		endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'`
   4.121 +		machine=${arch}${endian}-unknown
   4.122 +		;;
   4.123  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
   4.124  	esac
   4.125  	# The Operating System including object format, if it has switched
   4.126 -	# to ELF recently, or will in the future.
   4.127 +	# to ELF recently (or will in the future) and ABI.
   4.128  	case "${UNAME_MACHINE_ARCH}" in
   4.129 +	    earm*)
   4.130 +		os=netbsdelf
   4.131 +		;;
   4.132  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
   4.133  		eval $set_cc_for_build
   4.134  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
   4.135 @@ -180,7 +204,14 @@
   4.136  		fi
   4.137  		;;
   4.138  	    *)
   4.139 -	        os=netbsd
   4.140 +		os=netbsd
   4.141 +		;;
   4.142 +	esac
   4.143 +	# Determine ABI tags.
   4.144 +	case "${UNAME_MACHINE_ARCH}" in
   4.145 +	    earm*)
   4.146 +		expr='s/^earmv[0-9]/-eabi/;s/eb$//'
   4.147 +		abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"`
   4.148  		;;
   4.149  	esac
   4.150  	# The OS release
   4.151 @@ -193,18 +224,26 @@
   4.152  		release='-gnu'
   4.153  		;;
   4.154  	    *)
   4.155 -		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
   4.156 +		release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2`
   4.157  		;;
   4.158  	esac
   4.159  	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
   4.160  	# contains redundant information, the shorter form:
   4.161  	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
   4.162 -	echo "${machine}-${os}${release}"
   4.163 +	echo "${machine}-${os}${release}${abi}"
   4.164 +	exit ;;
   4.165 +    *:Bitrig:*:*)
   4.166 +	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
   4.167 +	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
   4.168  	exit ;;
   4.169      *:OpenBSD:*:*)
   4.170  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
   4.171  	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
   4.172  	exit ;;
   4.173 +    *:LibertyBSD:*:*)
   4.174 +	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
   4.175 +	echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE}
   4.176 +	exit ;;
   4.177      *:ekkoBSD:*:*)
   4.178  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
   4.179  	exit ;;
   4.180 @@ -217,13 +256,19 @@
   4.181      *:MirBSD:*:*)
   4.182  	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
   4.183  	exit ;;
   4.184 +    *:Sortix:*:*)
   4.185 +	echo ${UNAME_MACHINE}-unknown-sortix
   4.186 +	exit ;;
   4.187 +    *:Redox:*:*)
   4.188 +	echo ${UNAME_MACHINE}-unknown-redox
   4.189 +	exit ;;
   4.190      alpha:OSF1:*:*)
   4.191  	case $UNAME_RELEASE in
   4.192  	*4.0)
   4.193  		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
   4.194  		;;
   4.195  	*5.*)
   4.196 -	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
   4.197 +		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
   4.198  		;;
   4.199  	esac
   4.200  	# According to Compaq, /usr/sbin/psrinfo has been available on
   4.201 @@ -233,43 +278,46 @@
   4.202  	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
   4.203  	case "$ALPHA_CPU_TYPE" in
   4.204  	    "EV4 (21064)")
   4.205 -		UNAME_MACHINE="alpha" ;;
   4.206 +		UNAME_MACHINE=alpha ;;
   4.207  	    "EV4.5 (21064)")
   4.208 -		UNAME_MACHINE="alpha" ;;
   4.209 +		UNAME_MACHINE=alpha ;;
   4.210  	    "LCA4 (21066/21068)")
   4.211 -		UNAME_MACHINE="alpha" ;;
   4.212 +		UNAME_MACHINE=alpha ;;
   4.213  	    "EV5 (21164)")
   4.214 -		UNAME_MACHINE="alphaev5" ;;
   4.215 +		UNAME_MACHINE=alphaev5 ;;
   4.216  	    "EV5.6 (21164A)")
   4.217 -		UNAME_MACHINE="alphaev56" ;;
   4.218 +		UNAME_MACHINE=alphaev56 ;;
   4.219  	    "EV5.6 (21164PC)")
   4.220 -		UNAME_MACHINE="alphapca56" ;;
   4.221 +		UNAME_MACHINE=alphapca56 ;;
   4.222  	    "EV5.7 (21164PC)")
   4.223 -		UNAME_MACHINE="alphapca57" ;;
   4.224 +		UNAME_MACHINE=alphapca57 ;;
   4.225  	    "EV6 (21264)")
   4.226 -		UNAME_MACHINE="alphaev6" ;;
   4.227 +		UNAME_MACHINE=alphaev6 ;;
   4.228  	    "EV6.7 (21264A)")
   4.229 -		UNAME_MACHINE="alphaev67" ;;
   4.230 +		UNAME_MACHINE=alphaev67 ;;
   4.231  	    "EV6.8CB (21264C)")
   4.232 -		UNAME_MACHINE="alphaev68" ;;
   4.233 +		UNAME_MACHINE=alphaev68 ;;
   4.234  	    "EV6.8AL (21264B)")
   4.235 -		UNAME_MACHINE="alphaev68" ;;
   4.236 +		UNAME_MACHINE=alphaev68 ;;
   4.237  	    "EV6.8CX (21264D)")
   4.238 -		UNAME_MACHINE="alphaev68" ;;
   4.239 +		UNAME_MACHINE=alphaev68 ;;
   4.240  	    "EV6.9A (21264/EV69A)")
   4.241 -		UNAME_MACHINE="alphaev69" ;;
   4.242 +		UNAME_MACHINE=alphaev69 ;;
   4.243  	    "EV7 (21364)")
   4.244 -		UNAME_MACHINE="alphaev7" ;;
   4.245 +		UNAME_MACHINE=alphaev7 ;;
   4.246  	    "EV7.9 (21364A)")
   4.247 -		UNAME_MACHINE="alphaev79" ;;
   4.248 +		UNAME_MACHINE=alphaev79 ;;
   4.249  	esac
   4.250  	# A Pn.n version is a patched version.
   4.251  	# A Vn.n version is a released version.
   4.252  	# A Tn.n version is a released field test version.
   4.253  	# A Xn.n version is an unreleased experimental baselevel.
   4.254  	# 1.2 uses "1.2" for uname -r.
   4.255 -	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   4.256 -	exit ;;
   4.257 +	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
   4.258 +	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
   4.259 +	exitcode=$?
   4.260 +	trap '' 0
   4.261 +	exit $exitcode ;;
   4.262      Alpha\ *:Windows_NT*:*)
   4.263  	# How do we know it's Interix rather than the generic POSIX subsystem?
   4.264  	# Should we change UNAME_MACHINE based on the output of uname instead
   4.265 @@ -295,12 +343,12 @@
   4.266  	echo s390-ibm-zvmoe
   4.267  	exit ;;
   4.268      *:OS400:*:*)
   4.269 -        echo powerpc-ibm-os400
   4.270 +	echo powerpc-ibm-os400
   4.271  	exit ;;
   4.272      arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
   4.273  	echo arm-acorn-riscix${UNAME_RELEASE}
   4.274  	exit ;;
   4.275 -    arm:riscos:*:*|arm:RISCOS:*:*)
   4.276 +    arm*:riscos:*:*|arm*:RISCOS:*:*)
   4.277  	echo arm-unknown-riscos
   4.278  	exit ;;
   4.279      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
   4.280 @@ -333,18 +381,21 @@
   4.281      sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
   4.282  	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   4.283  	exit ;;
   4.284 +    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
   4.285 +	echo i386-pc-auroraux${UNAME_RELEASE}
   4.286 +	exit ;;
   4.287      i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
   4.288  	eval $set_cc_for_build
   4.289 -	SUN_ARCH="i386"
   4.290 +	SUN_ARCH=i386
   4.291  	# If there is a compiler, see if it is configured for 64-bit objects.
   4.292  	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
   4.293  	# This test works for both compilers.
   4.294 -	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   4.295 +	if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
   4.296  	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
   4.297 -		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   4.298 +		(CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   4.299  		grep IS_64BIT_ARCH >/dev/null
   4.300  	    then
   4.301 -		SUN_ARCH="x86_64"
   4.302 +		SUN_ARCH=x86_64
   4.303  	    fi
   4.304  	fi
   4.305  	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
   4.306 @@ -369,7 +420,7 @@
   4.307  	exit ;;
   4.308      sun*:*:4.2BSD:*)
   4.309  	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
   4.310 -	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
   4.311 +	test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3
   4.312  	case "`/bin/arch`" in
   4.313  	    sun3)
   4.314  		echo m68k-sun-sunos${UNAME_RELEASE}
   4.315 @@ -391,23 +442,23 @@
   4.316      # MiNT.  But MiNT is downward compatible to TOS, so this should
   4.317      # be no problem.
   4.318      atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
   4.319 -        echo m68k-atari-mint${UNAME_RELEASE}
   4.320 +	echo m68k-atari-mint${UNAME_RELEASE}
   4.321  	exit ;;
   4.322      atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
   4.323  	echo m68k-atari-mint${UNAME_RELEASE}
   4.324 -        exit ;;
   4.325 +	exit ;;
   4.326      *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
   4.327 -        echo m68k-atari-mint${UNAME_RELEASE}
   4.328 +	echo m68k-atari-mint${UNAME_RELEASE}
   4.329  	exit ;;
   4.330      milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
   4.331 -        echo m68k-milan-mint${UNAME_RELEASE}
   4.332 -        exit ;;
   4.333 +	echo m68k-milan-mint${UNAME_RELEASE}
   4.334 +	exit ;;
   4.335      hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
   4.336 -        echo m68k-hades-mint${UNAME_RELEASE}
   4.337 -        exit ;;
   4.338 +	echo m68k-hades-mint${UNAME_RELEASE}
   4.339 +	exit ;;
   4.340      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
   4.341 -        echo m68k-unknown-mint${UNAME_RELEASE}
   4.342 -        exit ;;
   4.343 +	echo m68k-unknown-mint${UNAME_RELEASE}
   4.344 +	exit ;;
   4.345      m68k:machten:*:*)
   4.346  	echo m68k-apple-machten${UNAME_RELEASE}
   4.347  	exit ;;
   4.348 @@ -477,8 +528,8 @@
   4.349  	echo m88k-motorola-sysv3
   4.350  	exit ;;
   4.351      AViiON:dgux:*:*)
   4.352 -        # DG/UX returns AViiON for all architectures
   4.353 -        UNAME_PROCESSOR=`/usr/bin/uname -p`
   4.354 +	# DG/UX returns AViiON for all architectures
   4.355 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   4.356  	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
   4.357  	then
   4.358  	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
   4.359 @@ -491,7 +542,7 @@
   4.360  	else
   4.361  	    echo i586-dg-dgux${UNAME_RELEASE}
   4.362  	fi
   4.363 - 	exit ;;
   4.364 +	exit ;;
   4.365      M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
   4.366  	echo m88k-dolphin-sysv3
   4.367  	exit ;;
   4.368 @@ -548,15 +599,16 @@
   4.369  		echo rs6000-ibm-aix3.2
   4.370  	fi
   4.371  	exit ;;
   4.372 -    *:AIX:*:[456])
   4.373 +    *:AIX:*:[4567])
   4.374  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
   4.375  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
   4.376  		IBM_ARCH=rs6000
   4.377  	else
   4.378  		IBM_ARCH=powerpc
   4.379  	fi
   4.380 -	if [ -x /usr/bin/oslevel ] ; then
   4.381 -		IBM_REV=`/usr/bin/oslevel`
   4.382 +	if [ -x /usr/bin/lslpp ] ; then
   4.383 +		IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc |
   4.384 +			   awk -F: '{ print $3 }' | sed s/[0-9]*$/0/`
   4.385  	else
   4.386  		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
   4.387  	fi
   4.388 @@ -591,58 +643,58 @@
   4.389  	    9000/[678][0-9][0-9])
   4.390  		if [ -x /usr/bin/getconf ]; then
   4.391  		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
   4.392 -                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   4.393 -                    case "${sc_cpu_version}" in
   4.394 -                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
   4.395 -                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
   4.396 -                      532)                      # CPU_PA_RISC2_0
   4.397 -                        case "${sc_kernel_bits}" in
   4.398 -                          32) HP_ARCH="hppa2.0n" ;;
   4.399 -                          64) HP_ARCH="hppa2.0w" ;;
   4.400 -			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
   4.401 -                        esac ;;
   4.402 -                    esac
   4.403 +		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
   4.404 +		    case "${sc_cpu_version}" in
   4.405 +		      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0
   4.406 +		      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1
   4.407 +		      532)                      # CPU_PA_RISC2_0
   4.408 +			case "${sc_kernel_bits}" in
   4.409 +			  32) HP_ARCH=hppa2.0n ;;
   4.410 +			  64) HP_ARCH=hppa2.0w ;;
   4.411 +			  '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20
   4.412 +			esac ;;
   4.413 +		    esac
   4.414  		fi
   4.415  		if [ "${HP_ARCH}" = "" ]; then
   4.416  		    eval $set_cc_for_build
   4.417 -		    sed 's/^              //' << EOF >$dummy.c
   4.418 +		    sed 's/^		//' << EOF >$dummy.c
   4.419  
   4.420 -              #define _HPUX_SOURCE
   4.421 -              #include <stdlib.h>
   4.422 -              #include <unistd.h>
   4.423 +		#define _HPUX_SOURCE
   4.424 +		#include <stdlib.h>
   4.425 +		#include <unistd.h>
   4.426  
   4.427 -              int main ()
   4.428 -              {
   4.429 -              #if defined(_SC_KERNEL_BITS)
   4.430 -                  long bits = sysconf(_SC_KERNEL_BITS);
   4.431 -              #endif
   4.432 -                  long cpu  = sysconf (_SC_CPU_VERSION);
   4.433 +		int main ()
   4.434 +		{
   4.435 +		#if defined(_SC_KERNEL_BITS)
   4.436 +		    long bits = sysconf(_SC_KERNEL_BITS);
   4.437 +		#endif
   4.438 +		    long cpu  = sysconf (_SC_CPU_VERSION);
   4.439  
   4.440 -                  switch (cpu)
   4.441 -              	{
   4.442 -              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   4.443 -              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   4.444 -              	case CPU_PA_RISC2_0:
   4.445 -              #if defined(_SC_KERNEL_BITS)
   4.446 -              	    switch (bits)
   4.447 -              		{
   4.448 -              		case 64: puts ("hppa2.0w"); break;
   4.449 -              		case 32: puts ("hppa2.0n"); break;
   4.450 -              		default: puts ("hppa2.0"); break;
   4.451 -              		} break;
   4.452 -              #else  /* !defined(_SC_KERNEL_BITS) */
   4.453 -              	    puts ("hppa2.0"); break;
   4.454 -              #endif
   4.455 -              	default: puts ("hppa1.0"); break;
   4.456 -              	}
   4.457 -                  exit (0);
   4.458 -              }
   4.459 +		    switch (cpu)
   4.460 +			{
   4.461 +			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
   4.462 +			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
   4.463 +			case CPU_PA_RISC2_0:
   4.464 +		#if defined(_SC_KERNEL_BITS)
   4.465 +			    switch (bits)
   4.466 +				{
   4.467 +				case 64: puts ("hppa2.0w"); break;
   4.468 +				case 32: puts ("hppa2.0n"); break;
   4.469 +				default: puts ("hppa2.0"); break;
   4.470 +				} break;
   4.471 +		#else  /* !defined(_SC_KERNEL_BITS) */
   4.472 +			    puts ("hppa2.0"); break;
   4.473 +		#endif
   4.474 +			default: puts ("hppa1.0"); break;
   4.475 +			}
   4.476 +		    exit (0);
   4.477 +		}
   4.478  EOF
   4.479 -		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   4.480 +		    (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
   4.481  		    test -z "$HP_ARCH" && HP_ARCH=hppa
   4.482  		fi ;;
   4.483  	esac
   4.484 -	if [ ${HP_ARCH} = "hppa2.0w" ]
   4.485 +	if [ ${HP_ARCH} = hppa2.0w ]
   4.486  	then
   4.487  	    eval $set_cc_for_build
   4.488  
   4.489 @@ -655,12 +707,12 @@
   4.490  	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
   4.491  	    # => hppa64-hp-hpux11.23
   4.492  
   4.493 -	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
   4.494 +	    if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) |
   4.495  		grep -q __LP64__
   4.496  	    then
   4.497 -		HP_ARCH="hppa2.0w"
   4.498 +		HP_ARCH=hppa2.0w
   4.499  	    else
   4.500 -		HP_ARCH="hppa64"
   4.501 +		HP_ARCH=hppa64
   4.502  	    fi
   4.503  	fi
   4.504  	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
   4.505 @@ -727,22 +779,22 @@
   4.506  	exit ;;
   4.507      C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
   4.508  	echo c1-convex-bsd
   4.509 -        exit ;;
   4.510 +	exit ;;
   4.511      C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
   4.512  	if getsysinfo -f scalar_acc
   4.513  	then echo c32-convex-bsd
   4.514  	else echo c2-convex-bsd
   4.515  	fi
   4.516 -        exit ;;
   4.517 +	exit ;;
   4.518      C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
   4.519  	echo c34-convex-bsd
   4.520 -        exit ;;
   4.521 +	exit ;;
   4.522      C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
   4.523  	echo c38-convex-bsd
   4.524 -        exit ;;
   4.525 +	exit ;;
   4.526      C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
   4.527  	echo c4-convex-bsd
   4.528 -        exit ;;
   4.529 +	exit ;;
   4.530      CRAY*Y-MP:*:*:*)
   4.531  	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   4.532  	exit ;;
   4.533 @@ -765,15 +817,15 @@
   4.534  	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
   4.535  	exit ;;
   4.536      F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
   4.537 -	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
   4.538 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   4.539 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   4.540 -        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   4.541 -        exit ;;
   4.542 +	FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`
   4.543 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   4.544 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
   4.545 +	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   4.546 +	exit ;;
   4.547      5000:UNIX_System_V:4.*:*)
   4.548 -        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
   4.549 -        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
   4.550 -        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   4.551 +	FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'`
   4.552 +	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'`
   4.553 +	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
   4.554  	exit ;;
   4.555      i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
   4.556  	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
   4.557 @@ -785,34 +837,40 @@
   4.558  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
   4.559  	exit ;;
   4.560      *:FreeBSD:*:*)
   4.561 -	case ${UNAME_MACHINE} in
   4.562 -	    pc98)
   4.563 -		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   4.564 +	UNAME_PROCESSOR=`/usr/bin/uname -p`
   4.565 +	case ${UNAME_PROCESSOR} in
   4.566  	    amd64)
   4.567 -		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   4.568 -	    *)
   4.569 -		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
   4.570 +		UNAME_PROCESSOR=x86_64 ;;
   4.571 +	    i386)
   4.572 +		UNAME_PROCESSOR=i586 ;;
   4.573  	esac
   4.574 +	echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
   4.575  	exit ;;
   4.576      i*:CYGWIN*:*)
   4.577  	echo ${UNAME_MACHINE}-pc-cygwin
   4.578  	exit ;;
   4.579 +    *:MINGW64*:*)
   4.580 +	echo ${UNAME_MACHINE}-pc-mingw64
   4.581 +	exit ;;
   4.582      *:MINGW*:*)
   4.583  	echo ${UNAME_MACHINE}-pc-mingw32
   4.584  	exit ;;
   4.585 +    *:MSYS*:*)
   4.586 +	echo ${UNAME_MACHINE}-pc-msys
   4.587 +	exit ;;
   4.588      i*:windows32*:*)
   4.589 -    	# uname -m includes "-pc" on this system.
   4.590 -    	echo ${UNAME_MACHINE}-mingw32
   4.591 +	# uname -m includes "-pc" on this system.
   4.592 +	echo ${UNAME_MACHINE}-mingw32
   4.593  	exit ;;
   4.594      i*:PW*:*)
   4.595  	echo ${UNAME_MACHINE}-pc-pw32
   4.596  	exit ;;
   4.597 -    *:Interix*:[3456]*)
   4.598 -    	case ${UNAME_MACHINE} in
   4.599 +    *:Interix*:*)
   4.600 +	case ${UNAME_MACHINE} in
   4.601  	    x86)
   4.602  		echo i586-pc-interix${UNAME_RELEASE}
   4.603  		exit ;;
   4.604 -	    EM64T | authenticamd | genuineintel)
   4.605 +	    authenticamd | genuineintel | EM64T)
   4.606  		echo x86_64-unknown-interix${UNAME_RELEASE}
   4.607  		exit ;;
   4.608  	    IA64)
   4.609 @@ -845,15 +903,22 @@
   4.610  	exit ;;
   4.611      *:GNU:*:*)
   4.612  	# the GNU system
   4.613 -	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   4.614 +	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
   4.615  	exit ;;
   4.616      *:GNU/*:*:*)
   4.617  	# other systems with GNU libc and userland
   4.618 -	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
   4.619 +	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
   4.620  	exit ;;
   4.621      i*86:Minix:*:*)
   4.622  	echo ${UNAME_MACHINE}-pc-minix
   4.623  	exit ;;
   4.624 +    aarch64:Linux:*:*)
   4.625 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.626 +	exit ;;
   4.627 +    aarch64_be:Linux:*:*)
   4.628 +	UNAME_MACHINE=aarch64_be
   4.629 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.630 +	exit ;;
   4.631      alpha:Linux:*:*)
   4.632  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
   4.633  	  EV5)   UNAME_MACHINE=alphaev5 ;;
   4.634 @@ -863,44 +928,62 @@
   4.635  	  EV6)   UNAME_MACHINE=alphaev6 ;;
   4.636  	  EV67)  UNAME_MACHINE=alphaev67 ;;
   4.637  	  EV68*) UNAME_MACHINE=alphaev68 ;;
   4.638 -        esac
   4.639 +	esac
   4.640  	objdump --private-headers /bin/sh | grep -q ld.so.1
   4.641 -	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
   4.642 -	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
   4.643 +	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
   4.644 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.645 +	exit ;;
   4.646 +    arc:Linux:*:* | arceb:Linux:*:*)
   4.647 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.648  	exit ;;
   4.649      arm*:Linux:*:*)
   4.650  	eval $set_cc_for_build
   4.651  	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
   4.652  	    | grep -q __ARM_EABI__
   4.653  	then
   4.654 -	    echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.655 +	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.656  	else
   4.657 -	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
   4.658 +	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
   4.659 +		| grep -q __ARM_PCS_VFP
   4.660 +	    then
   4.661 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
   4.662 +	    else
   4.663 +		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
   4.664 +	    fi
   4.665  	fi
   4.666  	exit ;;
   4.667      avr32*:Linux:*:*)
   4.668 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.669 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.670  	exit ;;
   4.671      cris:Linux:*:*)
   4.672 -	echo cris-axis-linux-gnu
   4.673 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
   4.674  	exit ;;
   4.675      crisv32:Linux:*:*)
   4.676 -	echo crisv32-axis-linux-gnu
   4.677 +	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
   4.678 +	exit ;;
   4.679 +    e2k:Linux:*:*)
   4.680 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.681  	exit ;;
   4.682      frv:Linux:*:*)
   4.683 -    	echo frv-unknown-linux-gnu
   4.684 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.685 +	exit ;;
   4.686 +    hexagon:Linux:*:*)
   4.687 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.688  	exit ;;
   4.689      i*86:Linux:*:*)
   4.690 -	echo ${UNAME_MACHINE}-pc-linux-gnu
   4.691 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
   4.692  	exit ;;
   4.693      ia64:Linux:*:*)
   4.694 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.695 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.696 +	exit ;;
   4.697 +    k1om:Linux:*:*)
   4.698 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.699  	exit ;;
   4.700      m32r*:Linux:*:*)
   4.701 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.702 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.703  	exit ;;
   4.704      m68*:Linux:*:*)
   4.705 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.706 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.707  	exit ;;
   4.708      mips:Linux:*:* | mips64:Linux:*:*)
   4.709  	eval $set_cc_for_build
   4.710 @@ -918,56 +1001,70 @@
   4.711  	#endif
   4.712  	#endif
   4.713  EOF
   4.714 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
   4.715 -	    /^CPU/{
   4.716 -		s: ::g
   4.717 -		p
   4.718 -	    }'`"
   4.719 -	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
   4.720 +	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
   4.721 +	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
   4.722  	;;
   4.723 -    or32:Linux:*:*)
   4.724 -	echo or32-unknown-linux-gnu
   4.725 +    mips64el:Linux:*:*)
   4.726 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.727 +	exit ;;
   4.728 +    openrisc*:Linux:*:*)
   4.729 +	echo or1k-unknown-linux-${LIBC}
   4.730 +	exit ;;
   4.731 +    or32:Linux:*:* | or1k*:Linux:*:*)
   4.732 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.733  	exit ;;
   4.734      padre:Linux:*:*)
   4.735 -	echo sparc-unknown-linux-gnu
   4.736 +	echo sparc-unknown-linux-${LIBC}
   4.737  	exit ;;
   4.738      parisc64:Linux:*:* | hppa64:Linux:*:*)
   4.739 -	echo hppa64-unknown-linux-gnu
   4.740 +	echo hppa64-unknown-linux-${LIBC}
   4.741  	exit ;;
   4.742      parisc:Linux:*:* | hppa:Linux:*:*)
   4.743  	# Look for CPU level
   4.744  	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
   4.745 -	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
   4.746 -	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
   4.747 -	  *)    echo hppa-unknown-linux-gnu ;;
   4.748 +	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
   4.749 +	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
   4.750 +	  *)    echo hppa-unknown-linux-${LIBC} ;;
   4.751  	esac
   4.752  	exit ;;
   4.753      ppc64:Linux:*:*)
   4.754 -	echo powerpc64-unknown-linux-gnu
   4.755 +	echo powerpc64-unknown-linux-${LIBC}
   4.756  	exit ;;
   4.757      ppc:Linux:*:*)
   4.758 -	echo powerpc-unknown-linux-gnu
   4.759 +	echo powerpc-unknown-linux-${LIBC}
   4.760 +	exit ;;
   4.761 +    ppc64le:Linux:*:*)
   4.762 +	echo powerpc64le-unknown-linux-${LIBC}
   4.763 +	exit ;;
   4.764 +    ppcle:Linux:*:*)
   4.765 +	echo powerpcle-unknown-linux-${LIBC}
   4.766 +	exit ;;
   4.767 +    riscv32:Linux:*:* | riscv64:Linux:*:*)
   4.768 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.769  	exit ;;
   4.770      s390:Linux:*:* | s390x:Linux:*:*)
   4.771 -	echo ${UNAME_MACHINE}-ibm-linux
   4.772 +	echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
   4.773  	exit ;;
   4.774      sh64*:Linux:*:*)
   4.775 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.776 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.777  	exit ;;
   4.778      sh*:Linux:*:*)
   4.779 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.780 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.781  	exit ;;
   4.782      sparc:Linux:*:* | sparc64:Linux:*:*)
   4.783 -	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.784 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.785 +	exit ;;
   4.786 +    tile*:Linux:*:*)
   4.787 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.788  	exit ;;
   4.789      vax:Linux:*:*)
   4.790 -	echo ${UNAME_MACHINE}-dec-linux-gnu
   4.791 +	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
   4.792  	exit ;;
   4.793      x86_64:Linux:*:*)
   4.794 -	echo x86_64-unknown-linux-gnu
   4.795 +	echo ${UNAME_MACHINE}-pc-linux-${LIBC}
   4.796  	exit ;;
   4.797      xtensa*:Linux:*:*)
   4.798 -    	echo ${UNAME_MACHINE}-unknown-linux-gnu
   4.799 +	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
   4.800  	exit ;;
   4.801      i*86:DYNIX/ptx:4*:*)
   4.802  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
   4.803 @@ -976,11 +1073,11 @@
   4.804  	echo i386-sequent-sysv4
   4.805  	exit ;;
   4.806      i*86:UNIX_SV:4.2MP:2.*)
   4.807 -        # Unixware is an offshoot of SVR4, but it has its own version
   4.808 -        # number series starting with 2...
   4.809 -        # I am not positive that other SVR4 systems won't match this,
   4.810 +	# Unixware is an offshoot of SVR4, but it has its own version
   4.811 +	# number series starting with 2...
   4.812 +	# I am not positive that other SVR4 systems won't match this,
   4.813  	# I just have to hope.  -- rms.
   4.814 -        # Use sysv4.2uw... so that sysv4* matches it.
   4.815 +	# Use sysv4.2uw... so that sysv4* matches it.
   4.816  	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
   4.817  	exit ;;
   4.818      i*86:OS/2:*:*)
   4.819 @@ -1012,7 +1109,7 @@
   4.820  	fi
   4.821  	exit ;;
   4.822      i*86:*:5:[678]*)
   4.823 -    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   4.824 +	# UnixWare 7.x, OpenUNIX and OpenServer 6.
   4.825  	case `/bin/uname -X | grep "^Machine"` in
   4.826  	    *486*)	     UNAME_MACHINE=i486 ;;
   4.827  	    *Pentium)	     UNAME_MACHINE=i586 ;;
   4.828 @@ -1040,13 +1137,13 @@
   4.829  	exit ;;
   4.830      pc:*:*:*)
   4.831  	# Left here for compatibility:
   4.832 -        # uname -m prints for DJGPP always 'pc', but it prints nothing about
   4.833 -        # the processor, so we play safe by assuming i586.
   4.834 +	# uname -m prints for DJGPP always 'pc', but it prints nothing about
   4.835 +	# the processor, so we play safe by assuming i586.
   4.836  	# Note: whatever this is, it MUST be the same as what config.sub
   4.837 -	# prints for the "djgpp" host, or else GDB configury will decide that
   4.838 +	# prints for the "djgpp" host, or else GDB configure will decide that
   4.839  	# this is a cross-build.
   4.840  	echo i586-pc-msdosdjgpp
   4.841 -        exit ;;
   4.842 +	exit ;;
   4.843      Intel:Mach:3*:*)
   4.844  	echo i386-pc-mach3
   4.845  	exit ;;
   4.846 @@ -1081,8 +1178,8 @@
   4.847  	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
   4.848  	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
   4.849      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
   4.850 -        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   4.851 -          && { echo i486-ncr-sysv4; exit; } ;;
   4.852 +	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
   4.853 +	  && { echo i486-ncr-sysv4; exit; } ;;
   4.854      NCR*:*:4.2:* | MPRAS*:*:4.2:*)
   4.855  	OS_REL='.3'
   4.856  	test -r /etc/.relid \
   4.857 @@ -1125,10 +1222,10 @@
   4.858  		echo ns32k-sni-sysv
   4.859  	fi
   4.860  	exit ;;
   4.861 -    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   4.862 -                      # says <Richard.M.Bartel@ccMail.Census.GOV>
   4.863 -        echo i586-unisys-sysv4
   4.864 -        exit ;;
   4.865 +    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
   4.866 +			# says <Richard.M.Bartel@ccMail.Census.GOV>
   4.867 +	echo i586-unisys-sysv4
   4.868 +	exit ;;
   4.869      *:UNIX_System_V:4*:FTX*)
   4.870  	# From Gerald Hewes <hewes@openmarket.com>.
   4.871  	# How about differentiating between stratus architectures? -djm
   4.872 @@ -1154,11 +1251,11 @@
   4.873  	exit ;;
   4.874      R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
   4.875  	if [ -d /usr/nec ]; then
   4.876 -	        echo mips-nec-sysv${UNAME_RELEASE}
   4.877 +		echo mips-nec-sysv${UNAME_RELEASE}
   4.878  	else
   4.879 -	        echo mips-unknown-sysv${UNAME_RELEASE}
   4.880 +		echo mips-unknown-sysv${UNAME_RELEASE}
   4.881  	fi
   4.882 -        exit ;;
   4.883 +	exit ;;
   4.884      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
   4.885  	echo powerpc-be-beos
   4.886  	exit ;;
   4.887 @@ -1171,6 +1268,9 @@
   4.888      BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
   4.889  	echo i586-pc-haiku
   4.890  	exit ;;
   4.891 +    x86_64:Haiku:*:*)
   4.892 +	echo x86_64-unknown-haiku
   4.893 +	exit ;;
   4.894      SX-4:SUPER-UX:*:*)
   4.895  	echo sx4-nec-superux${UNAME_RELEASE}
   4.896  	exit ;;
   4.897 @@ -1189,6 +1289,9 @@
   4.898      SX-8R:SUPER-UX:*:*)
   4.899  	echo sx8r-nec-superux${UNAME_RELEASE}
   4.900  	exit ;;
   4.901 +    SX-ACE:SUPER-UX:*:*)
   4.902 +	echo sxace-nec-superux${UNAME_RELEASE}
   4.903 +	exit ;;
   4.904      Power*:Rhapsody:*:*)
   4.905  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
   4.906  	exit ;;
   4.907 @@ -1197,24 +1300,43 @@
   4.908  	exit ;;
   4.909      *:Darwin:*:*)
   4.910  	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
   4.911 -	case $UNAME_PROCESSOR in
   4.912 -	    i386)
   4.913 -		eval $set_cc_for_build
   4.914 -		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
   4.915 -		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
   4.916 -		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
   4.917 -		      grep IS_64BIT_ARCH >/dev/null
   4.918 -		  then
   4.919 -		      UNAME_PROCESSOR="x86_64"
   4.920 -		  fi
   4.921 -		fi ;;
   4.922 -	    unknown) UNAME_PROCESSOR=powerpc ;;
   4.923 -	esac
   4.924 +	eval $set_cc_for_build
   4.925 +	if test "$UNAME_PROCESSOR" = unknown ; then
   4.926 +	    UNAME_PROCESSOR=powerpc
   4.927 +	fi
   4.928 +	if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
   4.929 +	    if [ "$CC_FOR_BUILD" != no_compiler_found ]; then
   4.930 +		if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
   4.931 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   4.932 +		       grep IS_64BIT_ARCH >/dev/null
   4.933 +		then
   4.934 +		    case $UNAME_PROCESSOR in
   4.935 +			i386) UNAME_PROCESSOR=x86_64 ;;
   4.936 +			powerpc) UNAME_PROCESSOR=powerpc64 ;;
   4.937 +		    esac
   4.938 +		fi
   4.939 +		# On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc
   4.940 +		if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \
   4.941 +		       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \
   4.942 +		       grep IS_PPC >/dev/null
   4.943 +		then
   4.944 +		    UNAME_PROCESSOR=powerpc
   4.945 +		fi
   4.946 +	    fi
   4.947 +	elif test "$UNAME_PROCESSOR" = i386 ; then
   4.948 +	    # Avoid executing cc on OS X 10.9, as it ships with a stub
   4.949 +	    # that puts up a graphical alert prompting to install
   4.950 +	    # developer tools.  Any system running Mac OS X 10.7 or
   4.951 +	    # later (Darwin 11 and later) is required to have a 64-bit
   4.952 +	    # processor. This is not true of the ARM version of Darwin
   4.953 +	    # that Apple uses in portable devices.
   4.954 +	    UNAME_PROCESSOR=x86_64
   4.955 +	fi
   4.956  	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
   4.957  	exit ;;
   4.958      *:procnto*:*:* | *:QNX:[0123456789]*:*)
   4.959  	UNAME_PROCESSOR=`uname -p`
   4.960 -	if test "$UNAME_PROCESSOR" = "x86"; then
   4.961 +	if test "$UNAME_PROCESSOR" = x86; then
   4.962  		UNAME_PROCESSOR=i386
   4.963  		UNAME_MACHINE=pc
   4.964  	fi
   4.965 @@ -1223,12 +1345,18 @@
   4.966      *:QNX:*:4*)
   4.967  	echo i386-pc-qnx
   4.968  	exit ;;
   4.969 -    NSE-?:NONSTOP_KERNEL:*:*)
   4.970 +    NEO-*:NONSTOP_KERNEL:*:*)
   4.971 +	echo neo-tandem-nsk${UNAME_RELEASE}
   4.972 +	exit ;;
   4.973 +    NSE-*:NONSTOP_KERNEL:*:*)
   4.974  	echo nse-tandem-nsk${UNAME_RELEASE}
   4.975  	exit ;;
   4.976 -    NSR-?:NONSTOP_KERNEL:*:*)
   4.977 +    NSR-*:NONSTOP_KERNEL:*:*)
   4.978  	echo nsr-tandem-nsk${UNAME_RELEASE}
   4.979  	exit ;;
   4.980 +    NSX-*:NONSTOP_KERNEL:*:*)
   4.981 +	echo nsx-tandem-nsk${UNAME_RELEASE}
   4.982 +	exit ;;
   4.983      *:NonStop-UX:*:*)
   4.984  	echo mips-compaq-nonstopux
   4.985  	exit ;;
   4.986 @@ -1242,7 +1370,7 @@
   4.987  	# "uname -m" is not consistent, so use $cputype instead. 386
   4.988  	# is converted to i386 for consistency with other x86
   4.989  	# operating systems.
   4.990 -	if test "$cputype" = "386"; then
   4.991 +	if test "$cputype" = 386; then
   4.992  	    UNAME_MACHINE=i386
   4.993  	else
   4.994  	    UNAME_MACHINE="$cputype"
   4.995 @@ -1268,13 +1396,13 @@
   4.996  	echo pdp10-unknown-its
   4.997  	exit ;;
   4.998      SEI:*:*:SEIUX)
   4.999 -        echo mips-sei-seiux${UNAME_RELEASE}
  4.1000 +	echo mips-sei-seiux${UNAME_RELEASE}
  4.1001  	exit ;;
  4.1002      *:DragonFly:*:*)
  4.1003  	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
  4.1004  	exit ;;
  4.1005      *:*VMS:*:*)
  4.1006 -    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  4.1007 +	UNAME_MACHINE=`(uname -p) 2>/dev/null`
  4.1008  	case "${UNAME_MACHINE}" in
  4.1009  	    A*) echo alpha-dec-vms ; exit ;;
  4.1010  	    I*) echo ia64-dec-vms ; exit ;;
  4.1011 @@ -1284,7 +1412,7 @@
  4.1012  	echo i386-pc-xenix
  4.1013  	exit ;;
  4.1014      i*86:skyos:*:*)
  4.1015 -	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
  4.1016 +	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'`
  4.1017  	exit ;;
  4.1018      i*86:rdos:*:*)
  4.1019  	echo ${UNAME_MACHINE}-pc-rdos
  4.1020 @@ -1292,174 +1420,28 @@
  4.1021      i*86:AROS:*:*)
  4.1022  	echo ${UNAME_MACHINE}-pc-aros
  4.1023  	exit ;;
  4.1024 +    x86_64:VMkernel:*:*)
  4.1025 +	echo ${UNAME_MACHINE}-unknown-esx
  4.1026 +	exit ;;
  4.1027 +    amd64:Isilon\ OneFS:*:*)
  4.1028 +	echo x86_64-unknown-onefs
  4.1029 +	exit ;;
  4.1030  esac
  4.1031  
  4.1032 -#echo '(No uname command or uname output not recognized.)' 1>&2
  4.1033 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
  4.1034 -
  4.1035 -eval $set_cc_for_build
  4.1036 -cat >$dummy.c <<EOF
  4.1037 -#ifdef _SEQUENT_
  4.1038 -# include <sys/types.h>
  4.1039 -# include <sys/utsname.h>
  4.1040 -#endif
  4.1041 -main ()
  4.1042 -{
  4.1043 -#if defined (sony)
  4.1044 -#if defined (MIPSEB)
  4.1045 -  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
  4.1046 -     I don't know....  */
  4.1047 -  printf ("mips-sony-bsd\n"); exit (0);
  4.1048 -#else
  4.1049 -#include <sys/param.h>
  4.1050 -  printf ("m68k-sony-newsos%s\n",
  4.1051 -#ifdef NEWSOS4
  4.1052 -          "4"
  4.1053 -#else
  4.1054 -	  ""
  4.1055 -#endif
  4.1056 -         ); exit (0);
  4.1057 -#endif
  4.1058 -#endif
  4.1059 -
  4.1060 -#if defined (__arm) && defined (__acorn) && defined (__unix)
  4.1061 -  printf ("arm-acorn-riscix\n"); exit (0);
  4.1062 -#endif
  4.1063 -
  4.1064 -#if defined (hp300) && !defined (hpux)
  4.1065 -  printf ("m68k-hp-bsd\n"); exit (0);
  4.1066 -#endif
  4.1067 -
  4.1068 -#if defined (NeXT)
  4.1069 -#if !defined (__ARCHITECTURE__)
  4.1070 -#define __ARCHITECTURE__ "m68k"
  4.1071 -#endif
  4.1072 -  int version;
  4.1073 -  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
  4.1074 -  if (version < 4)
  4.1075 -    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
  4.1076 -  else
  4.1077 -    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
  4.1078 -  exit (0);
  4.1079 -#endif
  4.1080 -
  4.1081 -#if defined (MULTIMAX) || defined (n16)
  4.1082 -#if defined (UMAXV)
  4.1083 -  printf ("ns32k-encore-sysv\n"); exit (0);
  4.1084 -#else
  4.1085 -#if defined (CMU)
  4.1086 -  printf ("ns32k-encore-mach\n"); exit (0);
  4.1087 -#else
  4.1088 -  printf ("ns32k-encore-bsd\n"); exit (0);
  4.1089 -#endif
  4.1090 -#endif
  4.1091 -#endif
  4.1092 -
  4.1093 -#if defined (__386BSD__)
  4.1094 -  printf ("i386-pc-bsd\n"); exit (0);
  4.1095 -#endif
  4.1096 -
  4.1097 -#if defined (sequent)
  4.1098 -#if defined (i386)
  4.1099 -  printf ("i386-sequent-dynix\n"); exit (0);
  4.1100 -#endif
  4.1101 -#if defined (ns32000)
  4.1102 -  printf ("ns32k-sequent-dynix\n"); exit (0);
  4.1103 -#endif
  4.1104 -#endif
  4.1105 -
  4.1106 -#if defined (_SEQUENT_)
  4.1107 -    struct utsname un;
  4.1108 -
  4.1109 -    uname(&un);
  4.1110 -
  4.1111 -    if (strncmp(un.version, "V2", 2) == 0) {
  4.1112 -	printf ("i386-sequent-ptx2\n"); exit (0);
  4.1113 -    }
  4.1114 -    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
  4.1115 -	printf ("i386-sequent-ptx1\n"); exit (0);
  4.1116 -    }
  4.1117 -    printf ("i386-sequent-ptx\n"); exit (0);
  4.1118 -
  4.1119 -#endif
  4.1120 -
  4.1121 -#if defined (vax)
  4.1122 -# if !defined (ultrix)
  4.1123 -#  include <sys/param.h>
  4.1124 -#  if defined (BSD)
  4.1125 -#   if BSD == 43
  4.1126 -      printf ("vax-dec-bsd4.3\n"); exit (0);
  4.1127 -#   else
  4.1128 -#    if BSD == 199006
  4.1129 -      printf ("vax-dec-bsd4.3reno\n"); exit (0);
  4.1130 -#    else
  4.1131 -      printf ("vax-dec-bsd\n"); exit (0);
  4.1132 -#    endif
  4.1133 -#   endif
  4.1134 -#  else
  4.1135 -    printf ("vax-dec-bsd\n"); exit (0);
  4.1136 -#  endif
  4.1137 -# else
  4.1138 -    printf ("vax-dec-ultrix\n"); exit (0);
  4.1139 -# endif
  4.1140 -#endif
  4.1141 -
  4.1142 -#if defined (alliant) && defined (i860)
  4.1143 -  printf ("i860-alliant-bsd\n"); exit (0);
  4.1144 -#endif
  4.1145 -
  4.1146 -  exit (1);
  4.1147 -}
  4.1148 -EOF
  4.1149 -
  4.1150 -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
  4.1151 -	{ echo "$SYSTEM_NAME"; exit; }
  4.1152 -
  4.1153 -# Apollos put the system type in the environment.
  4.1154 -
  4.1155 -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
  4.1156 -
  4.1157 -# Convex versions that predate uname can use getsysinfo(1)
  4.1158 -
  4.1159 -if [ -x /usr/convex/getsysinfo ]
  4.1160 -then
  4.1161 -    case `getsysinfo -f cpu_type` in
  4.1162 -    c1*)
  4.1163 -	echo c1-convex-bsd
  4.1164 -	exit ;;
  4.1165 -    c2*)
  4.1166 -	if getsysinfo -f scalar_acc
  4.1167 -	then echo c32-convex-bsd
  4.1168 -	else echo c2-convex-bsd
  4.1169 -	fi
  4.1170 -	exit ;;
  4.1171 -    c34*)
  4.1172 -	echo c34-convex-bsd
  4.1173 -	exit ;;
  4.1174 -    c38*)
  4.1175 -	echo c38-convex-bsd
  4.1176 -	exit ;;
  4.1177 -    c4*)
  4.1178 -	echo c4-convex-bsd
  4.1179 -	exit ;;
  4.1180 -    esac
  4.1181 -fi
  4.1182 -
  4.1183  cat >&2 <<EOF
  4.1184  $0: unable to guess system type
  4.1185  
  4.1186 -This script, last modified $timestamp, has failed to recognize
  4.1187 -the operating system you are using. It is advised that you
  4.1188 -download the most up to date version of the config scripts from
  4.1189 +This script (version $timestamp), has failed to recognize the
  4.1190 +operating system you are using. If your script is old, overwrite *all*
  4.1191 +copies of config.guess and config.sub with the latest versions from:
  4.1192  
  4.1193 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
  4.1194 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess
  4.1195  and
  4.1196 -  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
  4.1197 +  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
  4.1198  
  4.1199 -If the version you run ($0) is already up to date, please
  4.1200 -send the following data and any information you think might be
  4.1201 -pertinent to <config-patches@gnu.org> in order to provide the needed
  4.1202 -information to handle your system.
  4.1203 +If $0 has already been updated, send the following data and any
  4.1204 +information you think might be pertinent to config-patches@gnu.org to
  4.1205 +provide the necessary information to handle your system.
  4.1206  
  4.1207  config.guess timestamp = $timestamp
  4.1208  
     5.1 --- a/config.sub	Wed May 27 10:49:02 2015 -0400
     5.2 +++ b/config.sub	Sat Oct 13 11:11:02 2018 +0300
     5.3 @@ -1,38 +1,31 @@
     5.4  #! /bin/sh
     5.5  # Configuration validation subroutine script.
     5.6 -#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
     5.7 -#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
     5.8 -#   Free Software Foundation, Inc.
     5.9 +#   Copyright 1992-2017 Free Software Foundation, Inc.
    5.10  
    5.11 -timestamp='2009-10-07'
    5.12 +timestamp='2017-04-02'
    5.13  
    5.14 -# This file is (in principle) common to ALL GNU software.
    5.15 -# The presence of a machine in this file suggests that SOME GNU software
    5.16 -# can handle that machine.  It does not imply ALL GNU software can.
    5.17 -#
    5.18 -# This file is free software; you can redistribute it and/or modify
    5.19 -# it under the terms of the GNU General Public License as published by
    5.20 -# the Free Software Foundation; either version 2 of the License, or
    5.21 +# This file is free software; you can redistribute it and/or modify it
    5.22 +# under the terms of the GNU General Public License as published by
    5.23 +# the Free Software Foundation; either version 3 of the License, or
    5.24  # (at your option) any later version.
    5.25  #
    5.26 -# This program is distributed in the hope that it will be useful,
    5.27 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
    5.28 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    5.29 -# GNU General Public License for more details.
    5.30 +# This program is distributed in the hope that it will be useful, but
    5.31 +# WITHOUT ANY WARRANTY; without even the implied warranty of
    5.32 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    5.33 +# General Public License for more details.
    5.34  #
    5.35  # You should have received a copy of the GNU General Public License
    5.36 -# along with this program; if not, write to the Free Software
    5.37 -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
    5.38 -# 02110-1301, USA.
    5.39 +# along with this program; if not, see <http://www.gnu.org/licenses/>.
    5.40  #
    5.41  # As a special exception to the GNU General Public License, if you
    5.42  # distribute this file as part of a program that contains a
    5.43  # configuration script generated by Autoconf, you may include it under
    5.44 -# the same distribution terms that you use for the rest of that program.
    5.45 +# the same distribution terms that you use for the rest of that
    5.46 +# program.  This Exception is an additional permission under section 7
    5.47 +# of the GNU General Public License, version 3 ("GPLv3").
    5.48  
    5.49  
    5.50 -# Please send patches to <config-patches@gnu.org>.  Submit a context
    5.51 -# diff and a properly formatted GNU ChangeLog entry.
    5.52 +# Please send patches to <config-patches@gnu.org>.
    5.53  #
    5.54  # Configuration subroutine to validate and canonicalize a configuration type.
    5.55  # Supply the specified configuration type as an argument.
    5.56 @@ -40,7 +33,7 @@
    5.57  # Otherwise, we print the canonical config type on stdout and succeed.
    5.58  
    5.59  # You can get the latest version of this script from:
    5.60 -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
    5.61 +# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub
    5.62  
    5.63  # This file is supposed to be the same for all GNU packages
    5.64  # and recognize all the CPU types, system types and aliases
    5.65 @@ -60,8 +53,7 @@
    5.66  me=`echo "$0" | sed -e 's,.*/,,'`
    5.67  
    5.68  usage="\
    5.69 -Usage: $0 [OPTION] CPU-MFR-OPSYS
    5.70 -       $0 [OPTION] ALIAS
    5.71 +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS
    5.72  
    5.73  Canonicalize a configuration name.
    5.74  
    5.75 @@ -75,8 +67,7 @@
    5.76  version="\
    5.77  GNU config.sub ($timestamp)
    5.78  
    5.79 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
    5.80 -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    5.81 +Copyright 1992-2017 Free Software Foundation, Inc.
    5.82  
    5.83  This is free software; see the source for copying conditions.  There is NO
    5.84  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
    5.85 @@ -123,13 +114,18 @@
    5.86  # Here we must recognize all the valid KERNEL-OS combinations.
    5.87  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    5.88  case $maybe_os in
    5.89 -  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    5.90 -  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
    5.91 -  kopensolaris*-gnu* | \
    5.92 +  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
    5.93 +  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
    5.94 +  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \
    5.95 +  kopensolaris*-gnu* | cloudabi*-eabi* | \
    5.96    storm-chaos* | os2-emx* | rtmk-nova*)
    5.97      os=-$maybe_os
    5.98      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    5.99      ;;
   5.100 +  android-linux)
   5.101 +    os=-linux-android
   5.102 +    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
   5.103 +    ;;
   5.104    *)
   5.105      basic_machine=`echo $1 | sed 's/-[^-]*$//'`
   5.106      if [ $basic_machine != $1 ]
   5.107 @@ -152,12 +148,12 @@
   5.108  	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
   5.109  	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
   5.110  	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
   5.111 -	-apple | -axis | -knuth | -cray | -microblaze)
   5.112 +	-apple | -axis | -knuth | -cray | -microblaze*)
   5.113  		os=
   5.114  		basic_machine=$1
   5.115  		;;
   5.116 -        -bluegene*)
   5.117 -	        os=-cnk
   5.118 +	-bluegene*)
   5.119 +		os=-cnk
   5.120  		;;
   5.121  	-sim | -cisco | -oki | -wec | -winbond)
   5.122  		os=
   5.123 @@ -173,10 +169,10 @@
   5.124  		os=-chorusos
   5.125  		basic_machine=$1
   5.126  		;;
   5.127 - 	-chorusrdb)
   5.128 - 		os=-chorusrdb
   5.129 +	-chorusrdb)
   5.130 +		os=-chorusrdb
   5.131  		basic_machine=$1
   5.132 - 		;;
   5.133 +		;;
   5.134  	-hiux*)
   5.135  		os=-hiuxwe2
   5.136  		;;
   5.137 @@ -221,6 +217,12 @@
   5.138  	-isc*)
   5.139  		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
   5.140  		;;
   5.141 +	-lynx*178)
   5.142 +		os=-lynxos178
   5.143 +		;;
   5.144 +	-lynx*5)
   5.145 +		os=-lynxos5
   5.146 +		;;
   5.147  	-lynx*)
   5.148  		os=-lynxos
   5.149  		;;
   5.150 @@ -245,20 +247,29 @@
   5.151  	# Some are omitted here because they have special meanings below.
   5.152  	1750a | 580 \
   5.153  	| a29k \
   5.154 +	| aarch64 | aarch64_be \
   5.155  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
   5.156  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
   5.157  	| am33_2.0 \
   5.158 -	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
   5.159 +	| arc | arceb \
   5.160 +	| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
   5.161 +	| avr | avr32 \
   5.162 +	| ba \
   5.163 +	| be32 | be64 \
   5.164  	| bfin \
   5.165 -	| c4x | clipper \
   5.166 +	| c4x | c8051 | clipper \
   5.167  	| d10v | d30v | dlx | dsp16xx \
   5.168 -	| fido | fr30 | frv \
   5.169 +	| e2k | epiphany \
   5.170 +	| fido | fr30 | frv | ft32 \
   5.171  	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
   5.172 -	| i370 | i860 | i960 | ia64 \
   5.173 +	| hexagon \
   5.174 +	| i370 | i860 | i960 | ia16 | ia64 \
   5.175  	| ip2k | iq2000 \
   5.176 +	| k1om \
   5.177 +	| le32 | le64 \
   5.178  	| lm32 \
   5.179  	| m32c | m32r | m32rle | m68000 | m68k | m88k \
   5.180 -	| maxq | mb | microblaze | mcore | mep | metag \
   5.181 +	| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
   5.182  	| mips | mipsbe | mipseb | mipsel | mipsle \
   5.183  	| mips16 \
   5.184  	| mips64 | mips64el \
   5.185 @@ -272,37 +283,57 @@
   5.186  	| mips64vr5900 | mips64vr5900el \
   5.187  	| mipsisa32 | mipsisa32el \
   5.188  	| mipsisa32r2 | mipsisa32r2el \
   5.189 +	| mipsisa32r6 | mipsisa32r6el \
   5.190  	| mipsisa64 | mipsisa64el \
   5.191  	| mipsisa64r2 | mipsisa64r2el \
   5.192 +	| mipsisa64r6 | mipsisa64r6el \
   5.193  	| mipsisa64sb1 | mipsisa64sb1el \
   5.194  	| mipsisa64sr71k | mipsisa64sr71kel \
   5.195 +	| mipsr5900 | mipsr5900el \
   5.196  	| mipstx39 | mipstx39el \
   5.197  	| mn10200 | mn10300 \
   5.198  	| moxie \
   5.199  	| mt \
   5.200  	| msp430 \
   5.201 -	| nios | nios2 \
   5.202 +	| nds32 | nds32le | nds32be \
   5.203 +	| nios | nios2 | nios2eb | nios2el \
   5.204  	| ns16k | ns32k \
   5.205 -	| or32 \
   5.206 +	| open8 | or1k | or1knd | or32 \
   5.207  	| pdp10 | pdp11 | pj | pjl \
   5.208 -	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
   5.209 +	| powerpc | powerpc64 | powerpc64le | powerpcle \
   5.210 +	| pru \
   5.211  	| pyramid \
   5.212 -	| rx \
   5.213 +	| riscv32 | riscv64 \
   5.214 +	| rl78 | rx \
   5.215  	| score \
   5.216 -	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   5.217 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
   5.218  	| sh64 | sh64le \
   5.219  	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
   5.220  	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
   5.221 -	| spu | strongarm \
   5.222 -	| tahoe | thumb | tic4x | tic80 | tron \
   5.223 -	| v850 | v850e \
   5.224 +	| spu \
   5.225 +	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
   5.226 +	| ubicom32 \
   5.227 +	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
   5.228 +	| visium \
   5.229 +	| wasm32 \
   5.230  	| we32k \
   5.231 -	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
   5.232 +	| x86 | xc16x | xstormy16 | xtensa \
   5.233  	| z8k | z80)
   5.234  		basic_machine=$basic_machine-unknown
   5.235  		;;
   5.236 -	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
   5.237 -		# Motorola 68HC11/12.
   5.238 +	c54x)
   5.239 +		basic_machine=tic54x-unknown
   5.240 +		;;
   5.241 +	c55x)
   5.242 +		basic_machine=tic55x-unknown
   5.243 +		;;
   5.244 +	c6x)
   5.245 +		basic_machine=tic6x-unknown
   5.246 +		;;
   5.247 +	leon|leon[3-9])
   5.248 +		basic_machine=sparc-$basic_machine
   5.249 +		;;
   5.250 +	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip)
   5.251  		basic_machine=$basic_machine-unknown
   5.252  		os=-none
   5.253  		;;
   5.254 @@ -312,6 +343,21 @@
   5.255  		basic_machine=mt-unknown
   5.256  		;;
   5.257  
   5.258 +	strongarm | thumb | xscale)
   5.259 +		basic_machine=arm-unknown
   5.260 +		;;
   5.261 +	xgate)
   5.262 +		basic_machine=$basic_machine-unknown
   5.263 +		os=-none
   5.264 +		;;
   5.265 +	xscaleeb)
   5.266 +		basic_machine=armeb-unknown
   5.267 +		;;
   5.268 +
   5.269 +	xscaleel)
   5.270 +		basic_machine=armel-unknown
   5.271 +		;;
   5.272 +
   5.273  	# We use `pc' rather than `unknown'
   5.274  	# because (1) that's what they normally are, and
   5.275  	# (2) the word "unknown" tends to confuse beginning users.
   5.276 @@ -326,25 +372,32 @@
   5.277  	# Recognize the basic CPU types with company name.
   5.278  	580-* \
   5.279  	| a29k-* \
   5.280 +	| aarch64-* | aarch64_be-* \
   5.281  	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
   5.282  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
   5.283 -	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
   5.284 +	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
   5.285  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
   5.286  	| avr-* | avr32-* \
   5.287 +	| ba-* \
   5.288 +	| be32-* | be64-* \
   5.289  	| bfin-* | bs2000-* \
   5.290 -	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
   5.291 -	| clipper-* | craynv-* | cydra-* \
   5.292 +	| c[123]* | c30-* | [cjt]90-* | c4x-* \
   5.293 +	| c8051-* | clipper-* | craynv-* | cydra-* \
   5.294  	| d10v-* | d30v-* | dlx-* \
   5.295 -	| elxsi-* \
   5.296 +	| e2k-* | elxsi-* \
   5.297  	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
   5.298  	| h8300-* | h8500-* \
   5.299  	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
   5.300 -	| i*86-* | i860-* | i960-* | ia64-* \
   5.301 +	| hexagon-* \
   5.302 +	| i*86-* | i860-* | i960-* | ia16-* | ia64-* \
   5.303  	| ip2k-* | iq2000-* \
   5.304 +	| k1om-* \
   5.305 +	| le32-* | le64-* \
   5.306  	| lm32-* \
   5.307  	| m32c-* | m32r-* | m32rle-* \
   5.308  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
   5.309 -	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
   5.310 +	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
   5.311 +	| microblaze-* | microblazeel-* \
   5.312  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
   5.313  	| mips16-* \
   5.314  	| mips64-* | mips64el-* \
   5.315 @@ -358,32 +411,45 @@
   5.316  	| mips64vr5900-* | mips64vr5900el-* \
   5.317  	| mipsisa32-* | mipsisa32el-* \
   5.318  	| mipsisa32r2-* | mipsisa32r2el-* \
   5.319 +	| mipsisa32r6-* | mipsisa32r6el-* \
   5.320  	| mipsisa64-* | mipsisa64el-* \
   5.321  	| mipsisa64r2-* | mipsisa64r2el-* \
   5.322 +	| mipsisa64r6-* | mipsisa64r6el-* \
   5.323  	| mipsisa64sb1-* | mipsisa64sb1el-* \
   5.324  	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
   5.325 +	| mipsr5900-* | mipsr5900el-* \
   5.326  	| mipstx39-* | mipstx39el-* \
   5.327  	| mmix-* \
   5.328  	| mt-* \
   5.329  	| msp430-* \
   5.330 -	| nios-* | nios2-* \
   5.331 +	| nds32-* | nds32le-* | nds32be-* \
   5.332 +	| nios-* | nios2-* | nios2eb-* | nios2el-* \
   5.333  	| none-* | np1-* | ns16k-* | ns32k-* \
   5.334 +	| open8-* \
   5.335 +	| or1k*-* \
   5.336  	| orion-* \
   5.337  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
   5.338 -	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
   5.339 +	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
   5.340 +	| pru-* \
   5.341  	| pyramid-* \
   5.342 -	| romp-* | rs6000-* | rx-* \
   5.343 +	| riscv32-* | riscv64-* \
   5.344 +	| rl78-* | romp-* | rs6000-* | rx-* \
   5.345  	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
   5.346  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
   5.347  	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
   5.348  	| sparclite-* \
   5.349 -	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
   5.350 -	| tahoe-* | thumb-* \
   5.351 -	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
   5.352 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \
   5.353 +	| tahoe-* \
   5.354 +	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
   5.355 +	| tile*-* \
   5.356  	| tron-* \
   5.357 -	| v850-* | v850e-* | vax-* \
   5.358 +	| ubicom32-* \
   5.359 +	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
   5.360 +	| vax-* \
   5.361 +	| visium-* \
   5.362 +	| wasm32-* \
   5.363  	| we32k-* \
   5.364 -	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
   5.365 +	| x86-* | x86_64-* | xc16x-* | xps100-* \
   5.366  	| xstormy16-* | xtensa*-* \
   5.367  	| ymp-* \
   5.368  	| z8k-* | z80-*)
   5.369 @@ -408,7 +474,7 @@
   5.370  		basic_machine=a29k-amd
   5.371  		os=-udi
   5.372  		;;
   5.373 -    	abacus)
   5.374 +	abacus)
   5.375  		basic_machine=abacus-unknown
   5.376  		;;
   5.377  	adobe68k)
   5.378 @@ -458,6 +524,9 @@
   5.379  		basic_machine=i386-pc
   5.380  		os=-aros
   5.381  		;;
   5.382 +	asmjs)
   5.383 +		basic_machine=asmjs-unknown
   5.384 +		;;
   5.385  	aux)
   5.386  		basic_machine=m68k-apple
   5.387  		os=-aux
   5.388 @@ -478,11 +547,20 @@
   5.389  		basic_machine=powerpc-ibm
   5.390  		os=-cnk
   5.391  		;;
   5.392 +	c54x-*)
   5.393 +		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.394 +		;;
   5.395 +	c55x-*)
   5.396 +		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.397 +		;;
   5.398 +	c6x-*)
   5.399 +		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.400 +		;;
   5.401  	c90)
   5.402  		basic_machine=c90-cray
   5.403  		os=-unicos
   5.404  		;;
   5.405 -        cegcc)
   5.406 +	cegcc)
   5.407  		basic_machine=arm-unknown
   5.408  		os=-cegcc
   5.409  		;;
   5.410 @@ -514,7 +592,7 @@
   5.411  		basic_machine=craynv-cray
   5.412  		os=-unicosmp
   5.413  		;;
   5.414 -	cr16)
   5.415 +	cr16 | cr16-*)
   5.416  		basic_machine=cr16-unknown
   5.417  		os=-elf
   5.418  		;;
   5.419 @@ -569,6 +647,14 @@
   5.420  		basic_machine=m68k-bull
   5.421  		os=-sysv3
   5.422  		;;
   5.423 +	e500v[12])
   5.424 +		basic_machine=powerpc-unknown
   5.425 +		os=$os"spe"
   5.426 +		;;
   5.427 +	e500v[12]-*)
   5.428 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.429 +		os=$os"spe"
   5.430 +		;;
   5.431  	ebmon29k)
   5.432  		basic_machine=a29k-amd
   5.433  		os=-ebmon
   5.434 @@ -672,7 +758,6 @@
   5.435  	i370-ibm* | ibm*)
   5.436  		basic_machine=i370-ibm
   5.437  		;;
   5.438 -# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
   5.439  	i*86v32)
   5.440  		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
   5.441  		os=-sysv32
   5.442 @@ -711,6 +796,9 @@
   5.443  		basic_machine=m68k-isi
   5.444  		os=-sysv
   5.445  		;;
   5.446 +	leon-*|leon[3-9]-*)
   5.447 +		basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'`
   5.448 +		;;
   5.449  	m68knommu)
   5.450  		basic_machine=m68k-unknown
   5.451  		os=-linux
   5.452 @@ -730,11 +818,15 @@
   5.453  		basic_machine=ns32k-utek
   5.454  		os=-sysv
   5.455  		;;
   5.456 -        microblaze)
   5.457 +	microblaze*)
   5.458  		basic_machine=microblaze-xilinx
   5.459  		;;
   5.460 +	mingw64)
   5.461 +		basic_machine=x86_64-pc
   5.462 +		os=-mingw64
   5.463 +		;;
   5.464  	mingw32)
   5.465 -		basic_machine=i386-pc
   5.466 +		basic_machine=i686-pc
   5.467  		os=-mingw32
   5.468  		;;
   5.469  	mingw32ce)
   5.470 @@ -762,6 +854,10 @@
   5.471  		basic_machine=powerpc-unknown
   5.472  		os=-morphos
   5.473  		;;
   5.474 +	moxiebox)
   5.475 +		basic_machine=moxie-unknown
   5.476 +		os=-moxiebox
   5.477 +		;;
   5.478  	msdos)
   5.479  		basic_machine=i386-pc
   5.480  		os=-msdos
   5.481 @@ -769,10 +865,18 @@
   5.482  	ms1-*)
   5.483  		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
   5.484  		;;
   5.485 +	msys)
   5.486 +		basic_machine=i686-pc
   5.487 +		os=-msys
   5.488 +		;;
   5.489  	mvs)
   5.490  		basic_machine=i370-ibm
   5.491  		os=-mvs
   5.492  		;;
   5.493 +	nacl)
   5.494 +		basic_machine=le32-unknown
   5.495 +		os=-nacl
   5.496 +		;;
   5.497  	ncr3000)
   5.498  		basic_machine=i486-ncr
   5.499  		os=-sysv4
   5.500 @@ -837,9 +941,18 @@
   5.501  	np1)
   5.502  		basic_machine=np1-gould
   5.503  		;;
   5.504 +	neo-tandem)
   5.505 +		basic_machine=neo-tandem
   5.506 +		;;
   5.507 +	nse-tandem)
   5.508 +		basic_machine=nse-tandem
   5.509 +		;;
   5.510  	nsr-tandem)
   5.511  		basic_machine=nsr-tandem
   5.512  		;;
   5.513 +	nsx-tandem)
   5.514 +		basic_machine=nsx-tandem
   5.515 +		;;
   5.516  	op50n-* | op60c-*)
   5.517  		basic_machine=hppa1.1-oki
   5.518  		os=-proelf
   5.519 @@ -919,11 +1032,12 @@
   5.520  		;;
   5.521  	power)	basic_machine=power-ibm
   5.522  		;;
   5.523 -	ppc)	basic_machine=powerpc-unknown
   5.524 +	ppc | ppcbe)	basic_machine=powerpc-unknown
   5.525  		;;
   5.526 -	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.527 +	ppc-* | ppcbe-*)
   5.528 +		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.529  		;;
   5.530 -	ppcle | powerpclittle | ppc-le | powerpc-little)
   5.531 +	ppcle | powerpclittle)
   5.532  		basic_machine=powerpcle-unknown
   5.533  		;;
   5.534  	ppcle-* | powerpclittle-*)
   5.535 @@ -933,7 +1047,7 @@
   5.536  		;;
   5.537  	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.538  		;;
   5.539 -	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
   5.540 +	ppc64le | powerpc64little)
   5.541  		basic_machine=powerpc64le-unknown
   5.542  		;;
   5.543  	ppc64le-* | powerpc64little-*)
   5.544 @@ -946,7 +1060,11 @@
   5.545  		basic_machine=i586-unknown
   5.546  		os=-pw32
   5.547  		;;
   5.548 -	rdos)
   5.549 +	rdos | rdos64)
   5.550 +		basic_machine=x86_64-pc
   5.551 +		os=-rdos
   5.552 +		;;
   5.553 +	rdos32)
   5.554  		basic_machine=i386-pc
   5.555  		os=-rdos
   5.556  		;;
   5.557 @@ -1015,6 +1133,9 @@
   5.558  		basic_machine=i860-stratus
   5.559  		os=-sysv4
   5.560  		;;
   5.561 +	strongarm-* | thumb-*)
   5.562 +		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
   5.563 +		;;
   5.564  	sun2)
   5.565  		basic_machine=m68000-sun
   5.566  		;;
   5.567 @@ -1071,20 +1192,8 @@
   5.568  		basic_machine=t90-cray
   5.569  		os=-unicos
   5.570  		;;
   5.571 -	tic54x | c54x*)
   5.572 -		basic_machine=tic54x-unknown
   5.573 -		os=-coff
   5.574 -		;;
   5.575 -	tic55x | c55x*)
   5.576 -		basic_machine=tic55x-unknown
   5.577 -		os=-coff
   5.578 -		;;
   5.579 -	tic6x | c6x*)
   5.580 -		basic_machine=tic6x-unknown
   5.581 -		os=-coff
   5.582 -		;;
   5.583  	tile*)
   5.584 -		basic_machine=tile-unknown
   5.585 +		basic_machine=$basic_machine-unknown
   5.586  		os=-linux-gnu
   5.587  		;;
   5.588  	tx39)
   5.589 @@ -1139,6 +1248,9 @@
   5.590  		basic_machine=a29k-wrs
   5.591  		os=-vxworks
   5.592  		;;
   5.593 +	wasm32)
   5.594 +		basic_machine=wasm32-unknown
   5.595 +		;;
   5.596  	w65*)
   5.597  		basic_machine=w65-wdc
   5.598  		os=-none
   5.599 @@ -1154,6 +1266,9 @@
   5.600  	xps | xps100)
   5.601  		basic_machine=xps100-honeywell
   5.602  		;;
   5.603 +	xscale-* | xscalee[bl]-*)
   5.604 +		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
   5.605 +		;;
   5.606  	ymp)
   5.607  		basic_machine=ymp-cray
   5.608  		os=-unicos
   5.609 @@ -1251,9 +1366,12 @@
   5.610  if [ x"$os" != x"" ]
   5.611  then
   5.612  case $os in
   5.613 -        # First match some system type aliases
   5.614 -        # that might get confused with valid system types.
   5.615 +	# First match some system type aliases
   5.616 +	# that might get confused with valid system types.
   5.617  	# -solaris* is a basic system type, with this one exception.
   5.618 +	-auroraux)
   5.619 +		os=-auroraux
   5.620 +		;;
   5.621  	-solaris1 | -solaris1.*)
   5.622  		os=`echo $os | sed -e 's|solaris1|sunos4|'`
   5.623  		;;
   5.624 @@ -1275,29 +1393,31 @@
   5.625  	# -sysv* is not here because it comes later, after sysvr4.
   5.626  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
   5.627  	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
   5.628 -	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
   5.629 -	      | -kopensolaris* \
   5.630 +	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
   5.631 +	      | -sym* | -kopensolaris* | -plan9* \
   5.632  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
   5.633 -	      | -aos* | -aros* \
   5.634 +	      | -aos* | -aros* | -cloudabi* | -sortix* \
   5.635  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
   5.636  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
   5.637  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
   5.638 -	      | -openbsd* | -solidbsd* \
   5.639 +	      | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \
   5.640  	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
   5.641  	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
   5.642  	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
   5.643  	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
   5.644 -	      | -chorusos* | -chorusrdb* | -cegcc* \
   5.645 -	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   5.646 -	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
   5.647 -	      | -uxpv* | -beos* | -mpeix* | -udk* \
   5.648 +	      | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \
   5.649 +	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
   5.650 +	      | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
   5.651 +	      | -linux-newlib* | -linux-musl* | -linux-uclibc* \
   5.652 +	      | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \
   5.653  	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
   5.654  	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
   5.655  	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
   5.656  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
   5.657  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
   5.658  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
   5.659 -	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
   5.660 +	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \
   5.661 +	      | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox*)
   5.662  	# Remember, each alternative MUST END IN *, to match a version number.
   5.663  		;;
   5.664  	-qnx*)
   5.665 @@ -1336,7 +1456,7 @@
   5.666  	-opened*)
   5.667  		os=-openedition
   5.668  		;;
   5.669 -        -os400*)
   5.670 +	-os400*)
   5.671  		os=-os400
   5.672  		;;
   5.673  	-wince*)
   5.674 @@ -1385,7 +1505,7 @@
   5.675  	-sinix*)
   5.676  		os=-sysv4
   5.677  		;;
   5.678 -        -tpf*)
   5.679 +	-tpf*)
   5.680  		os=-tpf
   5.681  		;;
   5.682  	-triton*)
   5.683 @@ -1421,15 +1541,16 @@
   5.684  	-aros*)
   5.685  		os=-aros
   5.686  		;;
   5.687 -	-kaos*)
   5.688 -		os=-kaos
   5.689 -		;;
   5.690  	-zvmoe)
   5.691  		os=-zvmoe
   5.692  		;;
   5.693  	-dicos*)
   5.694  		os=-dicos
   5.695  		;;
   5.696 +	-nacl*)
   5.697 +		;;
   5.698 +	-ios)
   5.699 +		;;
   5.700  	-none)
   5.701  		;;
   5.702  	*)
   5.703 @@ -1452,10 +1573,10 @@
   5.704  # system, and we'll never get to this point.
   5.705  
   5.706  case $basic_machine in
   5.707 -        score-*)
   5.708 +	score-*)
   5.709  		os=-elf
   5.710  		;;
   5.711 -        spu-*)
   5.712 +	spu-*)
   5.713  		os=-elf
   5.714  		;;
   5.715  	*-acorn)
   5.716 @@ -1467,8 +1588,23 @@
   5.717  	arm*-semi)
   5.718  		os=-aout
   5.719  		;;
   5.720 -        c4x-* | tic4x-*)
   5.721 -        	os=-coff
   5.722 +	c4x-* | tic4x-*)
   5.723 +		os=-coff
   5.724 +		;;
   5.725 +	c8051-*)
   5.726 +		os=-elf
   5.727 +		;;
   5.728 +	hexagon-*)
   5.729 +		os=-elf
   5.730 +		;;
   5.731 +	tic54x-*)
   5.732 +		os=-coff
   5.733 +		;;
   5.734 +	tic55x-*)
   5.735 +		os=-coff
   5.736 +		;;
   5.737 +	tic6x-*)
   5.738 +		os=-coff
   5.739  		;;
   5.740  	# This must come before the *-dec entry.
   5.741  	pdp10-*)
   5.742 @@ -1488,14 +1624,11 @@
   5.743  		;;
   5.744  	m68000-sun)
   5.745  		os=-sunos3
   5.746 -		# This also exists in the configure program, but was not the
   5.747 -		# default.
   5.748 -		# os=-sunos4
   5.749  		;;
   5.750  	m68*-cisco)
   5.751  		os=-aout
   5.752  		;;
   5.753 -        mep-*)
   5.754 +	mep-*)
   5.755  		os=-elf
   5.756  		;;
   5.757  	mips*-cisco)
   5.758 @@ -1513,6 +1646,9 @@
   5.759  	sparc-* | *-sun)
   5.760  		os=-sunos4.1.1
   5.761  		;;
   5.762 +	pru-*)
   5.763 +		os=-elf
   5.764 +		;;
   5.765  	*-be)
   5.766  		os=-beos
   5.767  		;;
   5.768 @@ -1522,7 +1658,7 @@
   5.769  	*-ibm)
   5.770  		os=-aix
   5.771  		;;
   5.772 -    	*-knuth)
   5.773 +	*-knuth)
   5.774  		os=-mmixware
   5.775  		;;
   5.776  	*-wec)
     6.1 --- a/configure	Wed May 27 10:49:02 2015 -0400
     6.2 +++ b/configure	Sat Oct 13 11:11:02 2018 +0300
     6.3 @@ -1,9 +1,9 @@
     6.4  #! /bin/sh
     6.5  # Guess values for system-dependent variables and create Makefiles.
     6.6 -# Generated by GNU Autoconf 2.61.
     6.7 +# Generated by GNU Autoconf 2.63.
     6.8  #
     6.9  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
    6.10 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
    6.11 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    6.12  # This configure script is free software; the Free Software Foundation
    6.13  # gives unlimited permission to copy, distribute and modify it.
    6.14  ## --------------------- ##
    6.15 @@ -15,7 +15,7 @@
    6.16  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    6.17    emulate sh
    6.18    NULLCMD=:
    6.19 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
    6.20 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
    6.21    # is contrary to our usage.  Disable this feature.
    6.22    alias -g '${1+"$@"}'='"$@"'
    6.23    setopt NO_GLOB_SUBST
    6.24 @@ -37,17 +37,45 @@
    6.25  as_cr_digits='0123456789'
    6.26  as_cr_alnum=$as_cr_Letters$as_cr_digits
    6.27  
    6.28 +as_nl='
    6.29 +'
    6.30 +export as_nl
    6.31 +# Printing a long string crashes Solaris 7 /usr/bin/printf.
    6.32 +as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
    6.33 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
    6.34 +as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
    6.35 +if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
    6.36 +  as_echo='printf %s\n'
    6.37 +  as_echo_n='printf %s'
    6.38 +else
    6.39 +  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
    6.40 +    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
    6.41 +    as_echo_n='/usr/ucb/echo -n'
    6.42 +  else
    6.43 +    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
    6.44 +    as_echo_n_body='eval
    6.45 +      arg=$1;
    6.46 +      case $arg in
    6.47 +      *"$as_nl"*)
    6.48 +	expr "X$arg" : "X\\(.*\\)$as_nl";
    6.49 +	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
    6.50 +      esac;
    6.51 +      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
    6.52 +    '
    6.53 +    export as_echo_n_body
    6.54 +    as_echo_n='sh -c $as_echo_n_body as_echo'
    6.55 +  fi
    6.56 +  export as_echo_body
    6.57 +  as_echo='sh -c $as_echo_body as_echo'
    6.58 +fi
    6.59 +
    6.60  # The user is always right.
    6.61  if test "${PATH_SEPARATOR+set}" != set; then
    6.62 -  echo "#! /bin/sh" >conf$$.sh
    6.63 -  echo  "exit 0"   >>conf$$.sh
    6.64 -  chmod +x conf$$.sh
    6.65 -  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
    6.66 -    PATH_SEPARATOR=';'
    6.67 -  else
    6.68 -    PATH_SEPARATOR=:
    6.69 -  fi
    6.70 -  rm -f conf$$.sh
    6.71 +  PATH_SEPARATOR=:
    6.72 +  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
    6.73 +    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
    6.74 +      PATH_SEPARATOR=';'
    6.75 +  }
    6.76  fi
    6.77  
    6.78  # Support unset when possible.
    6.79 @@ -63,8 +91,6 @@
    6.80  # there to prevent editors from complaining about space-tab.
    6.81  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
    6.82  # splitting by setting IFS to empty value.)
    6.83 -as_nl='
    6.84 -'
    6.85  IFS=" ""	$as_nl"
    6.86  
    6.87  # Find who we are.  Look in the path if we contain no directory separator.
    6.88 @@ -87,7 +113,7 @@
    6.89    as_myself=$0
    6.90  fi
    6.91  if test ! -f "$as_myself"; then
    6.92 -  echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    6.93 +  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
    6.94    { (exit 1); exit 1; }
    6.95  fi
    6.96  
    6.97 @@ -100,17 +126,10 @@
    6.98  PS4='+ '
    6.99  
   6.100  # NLS nuisances.
   6.101 -for as_var in \
   6.102 -  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
   6.103 -  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
   6.104 -  LC_TELEPHONE LC_TIME
   6.105 -do
   6.106 -  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
   6.107 -    eval $as_var=C; export $as_var
   6.108 -  else
   6.109 -    ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   6.110 -  fi
   6.111 -done
   6.112 +LC_ALL=C
   6.113 +export LC_ALL
   6.114 +LANGUAGE=C
   6.115 +export LANGUAGE
   6.116  
   6.117  # Required to use basename.
   6.118  if expr a : '\(a\)' >/dev/null 2>&1 &&
   6.119 @@ -132,7 +151,7 @@
   6.120  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
   6.121  	 X"$0" : 'X\(//\)$' \| \
   6.122  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
   6.123 -echo X/"$0" |
   6.124 +$as_echo X/"$0" |
   6.125      sed '/^.*\/\([^/][^/]*\)\/*$/{
   6.126  	    s//\1/
   6.127  	    q
   6.128 @@ -158,7 +177,7 @@
   6.129    as_have_required=no
   6.130  fi
   6.131  
   6.132 -  if test $as_have_required = yes && 	 (eval ":
   6.133 +  if test $as_have_required = yes &&	 (eval ":
   6.134  (as_func_return () {
   6.135    (exit \$1)
   6.136  }
   6.137 @@ -240,7 +259,7 @@
   6.138  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   6.139    emulate sh
   6.140    NULLCMD=:
   6.141 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   6.142 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   6.143    # is contrary to our usage.  Disable this feature.
   6.144    alias -g '${1+"$@"}'='"$@"'
   6.145    setopt NO_GLOB_SUBST
   6.146 @@ -261,7 +280,7 @@
   6.147  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
   6.148    emulate sh
   6.149    NULLCMD=:
   6.150 -  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
   6.151 +  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
   6.152    # is contrary to our usage.  Disable this feature.
   6.153    alias -g '${1+"$@"}'='"$@"'
   6.154    setopt NO_GLOB_SUBST
   6.155 @@ -341,10 +360,10 @@
   6.156  
   6.157        if test "x$CONFIG_SHELL" != x; then
   6.158    for as_var in BASH_ENV ENV
   6.159 -        do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   6.160 -        done
   6.161 -        export CONFIG_SHELL
   6.162 -        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
   6.163 +	do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
   6.164 +	done
   6.165 +	export CONFIG_SHELL
   6.166 +	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
   6.167  fi
   6.168  
   6.169  
   6.170 @@ -413,9 +432,10 @@
   6.171  
   6.172  test \$exitcode = 0") || {
   6.173    echo No shell found that supports shell functions.
   6.174 -  echo Please tell autoconf@gnu.org about your system,
   6.175 -  echo including any error possibly output before this
   6.176 -  echo message
   6.177 +  echo Please tell bug-autoconf@gnu.org about your system,
   6.178 +  echo including any error possibly output before this message.
   6.179 +  echo This can help us improve future autoconf versions.
   6.180 +  echo Configuration will now proceed without shell functions.
   6.181  }
   6.182  
   6.183  
   6.184 @@ -451,7 +471,7 @@
   6.185        s/-\n.*//
   6.186      ' >$as_me.lineno &&
   6.187    chmod +x "$as_me.lineno" ||
   6.188 -    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
   6.189 +    { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
   6.190     { (exit 1); exit 1; }; }
   6.191  
   6.192    # Don't try to exec as it changes $[0], causing all sort of problems
   6.193 @@ -479,7 +499,6 @@
   6.194  *)
   6.195    ECHO_N='-n';;
   6.196  esac
   6.197 -
   6.198  if expr a : '\(a\)' >/dev/null 2>&1 &&
   6.199     test "X`expr 00001 : '.*\(...\)'`" = X001; then
   6.200    as_expr=expr
   6.201 @@ -492,19 +511,22 @@
   6.202    rm -f conf$$.dir/conf$$.file
   6.203  else
   6.204    rm -f conf$$.dir
   6.205 -  mkdir conf$$.dir
   6.206 -fi
   6.207 -echo >conf$$.file
   6.208 -if ln -s conf$$.file conf$$ 2>/dev/null; then
   6.209 -  as_ln_s='ln -s'
   6.210 -  # ... but there are two gotchas:
   6.211 -  # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
   6.212 -  # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
   6.213 -  # In both cases, we have to default to `cp -p'.
   6.214 -  ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
   6.215 +  mkdir conf$$.dir 2>/dev/null
   6.216 +fi
   6.217 +if (echo >conf$$.file) 2>/dev/null; then
   6.218 +  if ln -s conf$$.file conf$$ 2>/dev/null; then
   6.219 +    as_ln_s='ln -s'
   6.220 +    # ... but there are two gotchas:
   6.221 +    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
   6.222 +    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
   6.223 +    # In both cases, we have to default to `cp -p'.
   6.224 +    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
   6.225 +      as_ln_s='cp -p'
   6.226 +  elif ln conf$$.file conf$$ 2>/dev/null; then
   6.227 +    as_ln_s=ln
   6.228 +  else
   6.229      as_ln_s='cp -p'
   6.230 -elif ln conf$$.file conf$$ 2>/dev/null; then
   6.231 -  as_ln_s=ln
   6.232 +  fi
   6.233  else
   6.234    as_ln_s='cp -p'
   6.235  fi
   6.236 @@ -529,10 +551,10 @@
   6.237    as_test_x='
   6.238      eval sh -c '\''
   6.239        if test -d "$1"; then
   6.240 -        test -d "$1/.";
   6.241 +	test -d "$1/.";
   6.242        else
   6.243  	case $1 in
   6.244 -        -*)set "./$1";;
   6.245 +	-*)set "./$1";;
   6.246  	esac;
   6.247  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
   6.248  	???[sx]*):;;*)false;;esac;fi
   6.249 @@ -762,144 +784,178 @@
   6.250  # include <unistd.h>
   6.251  #endif"
   6.252  
   6.253 -ac_subst_vars='SHELL
   6.254 +ac_subst_vars='am__EXEEXT_FALSE
   6.255 +am__EXEEXT_TRUE
   6.256 +LTLIBOBJS
   6.257 +LIBOBJS
   6.258 +IMG_LIBS
   6.259 +LIBWEBP_LIBS
   6.260 +LIBWEBP_CFLAGS
   6.261 +LIBPNG_LIBS
   6.262 +LIBPNG_CFLAGS
   6.263 +SDL_CONFIG
   6.264 +SDL_LIBS
   6.265 +SDL_CFLAGS
   6.266 +PKG_CONFIG
   6.267 +SDL_VERSION
   6.268 +USE_VERSION_RC_FALSE
   6.269 +USE_VERSION_RC_TRUE
   6.270 +USE_IMAGEIO_FALSE
   6.271 +USE_IMAGEIO_TRUE
   6.272 +WINDRES
   6.273 +am__fastdepOBJC_FALSE
   6.274 +am__fastdepOBJC_TRUE
   6.275 +OBJCDEPMODE
   6.276 +ac_ct_OBJC
   6.277 +OBJCFLAGS
   6.278 +OBJC
   6.279 +am__fastdepCC_FALSE
   6.280 +am__fastdepCC_TRUE
   6.281 +CCDEPMODE
   6.282 +AMDEPBACKSLASH
   6.283 +AMDEP_FALSE
   6.284 +AMDEP_TRUE
   6.285 +am__quote
   6.286 +am__include
   6.287 +DEPDIR
   6.288 +am__untar
   6.289 +am__tar
   6.290 +AMTAR
   6.291 +am__leading_dot
   6.292 +SET_MAKE
   6.293 +AWK
   6.294 +mkdir_p
   6.295 +MKDIR_P
   6.296 +INSTALL_STRIP_PROGRAM
   6.297 +install_sh
   6.298 +MAKEINFO
   6.299 +AUTOHEADER
   6.300 +AUTOMAKE
   6.301 +AUTOCONF
   6.302 +ACLOCAL
   6.303 +PACKAGE
   6.304 +CYGPATH_W
   6.305 +am__isrc
   6.306 +INSTALL_DATA
   6.307 +INSTALL_SCRIPT
   6.308 +INSTALL_PROGRAM
   6.309 +LT_AGE
   6.310 +LT_REVISION
   6.311 +LT_CURRENT
   6.312 +LT_RELEASE
   6.313 +CPP
   6.314 +OTOOL64
   6.315 +OTOOL
   6.316 +LIPO
   6.317 +NMEDIT
   6.318 +DSYMUTIL
   6.319 +lt_ECHO
   6.320 +RANLIB
   6.321 +STRIP
   6.322 +AR
   6.323 +LN_S
   6.324 +NM
   6.325 +ac_ct_DUMPBIN
   6.326 +DUMPBIN
   6.327 +LD
   6.328 +FGREP
   6.329 +EGREP
   6.330 +GREP
   6.331 +SED
   6.332 +OBJEXT
   6.333 +EXEEXT
   6.334 +ac_ct_CC
   6.335 +CPPFLAGS
   6.336 +LDFLAGS
   6.337 +CFLAGS
   6.338 +CC
   6.339 +host_os
   6.340 +host_vendor
   6.341 +host_cpu
   6.342 +host
   6.343 +build_os
   6.344 +build_vendor
   6.345 +build_cpu
   6.346 +build
   6.347 +LIBTOOL
   6.348 +OBJDUMP
   6.349 +DLLTOOL
   6.350 +AS
   6.351 +VERSION
   6.352 +BINARY_AGE
   6.353 +INTERFACE_AGE
   6.354 +MICRO_VERSION
   6.355 +MINOR_VERSION
   6.356 +MAJOR_VERSION
   6.357 +target_alias
   6.358 +host_alias
   6.359 +build_alias
   6.360 +LIBS
   6.361 +ECHO_T
   6.362 +ECHO_N
   6.363 +ECHO_C
   6.364 +DEFS
   6.365 +mandir
   6.366 +localedir
   6.367 +libdir
   6.368 +psdir
   6.369 +pdfdir
   6.370 +dvidir
   6.371 +htmldir
   6.372 +infodir
   6.373 +docdir
   6.374 +oldincludedir
   6.375 +includedir
   6.376 +localstatedir
   6.377 +sharedstatedir
   6.378 +sysconfdir
   6.379 +datadir
   6.380 +datarootdir
   6.381 +libexecdir
   6.382 +sbindir
   6.383 +bindir
   6.384 +program_transform_name
   6.385 +prefix
   6.386 +exec_prefix
   6.387 +PACKAGE_BUGREPORT
   6.388 +PACKAGE_STRING
   6.389 +PACKAGE_VERSION
   6.390 +PACKAGE_TARNAME
   6.391 +PACKAGE_NAME
   6.392  PATH_SEPARATOR
   6.393 -PACKAGE_NAME
   6.394 -PACKAGE_TARNAME
   6.395 -PACKAGE_VERSION
   6.396 -PACKAGE_STRING
   6.397 -PACKAGE_BUGREPORT
   6.398 -exec_prefix
   6.399 -prefix
   6.400 -program_transform_name
   6.401 -bindir
   6.402 -sbindir
   6.403 -libexecdir
   6.404 -datarootdir
   6.405 -datadir
   6.406 -sysconfdir
   6.407 -sharedstatedir
   6.408 -localstatedir
   6.409 -includedir
   6.410 -oldincludedir
   6.411 -docdir
   6.412 -infodir
   6.413 -htmldir
   6.414 -dvidir
   6.415 -pdfdir
   6.416 -psdir
   6.417 -libdir
   6.418 -localedir
   6.419 -mandir
   6.420 -DEFS
   6.421 -ECHO_C
   6.422 -ECHO_N
   6.423 -ECHO_T
   6.424 -LIBS
   6.425 -build_alias
   6.426 -host_alias
   6.427 -target_alias
   6.428 -MAJOR_VERSION
   6.429 -MINOR_VERSION
   6.430 -MICRO_VERSION
   6.431 -INTERFACE_AGE
   6.432 -BINARY_AGE
   6.433 -VERSION
   6.434 -AS
   6.435 -DLLTOOL
   6.436 -OBJDUMP
   6.437 -LIBTOOL
   6.438 -build
   6.439 -build_cpu
   6.440 -build_vendor
   6.441 -build_os
   6.442 -host
   6.443 -host_cpu
   6.444 -host_vendor
   6.445 -host_os
   6.446 -CC
   6.447 -CFLAGS
   6.448 -LDFLAGS
   6.449 -CPPFLAGS
   6.450 -ac_ct_CC
   6.451 -EXEEXT
   6.452 -OBJEXT
   6.453 -SED
   6.454 -GREP
   6.455 -EGREP
   6.456 -FGREP
   6.457 -LD
   6.458 -DUMPBIN
   6.459 -ac_ct_DUMPBIN
   6.460 -NM
   6.461 -LN_S
   6.462 -AR
   6.463 -STRIP
   6.464 -RANLIB
   6.465 -lt_ECHO
   6.466 -DSYMUTIL
   6.467 -NMEDIT
   6.468 -LIPO
   6.469 -OTOOL
   6.470 -OTOOL64
   6.471 -CPP
   6.472 -LT_RELEASE
   6.473 -LT_CURRENT
   6.474 -LT_REVISION
   6.475 -LT_AGE
   6.476 -INSTALL_PROGRAM
   6.477 -INSTALL_SCRIPT
   6.478 -INSTALL_DATA
   6.479 -am__isrc
   6.480 -CYGPATH_W
   6.481 -PACKAGE
   6.482 -ACLOCAL
   6.483 -AUTOCONF
   6.484 -AUTOMAKE
   6.485 -AUTOHEADER
   6.486 -MAKEINFO
   6.487 -install_sh
   6.488 -INSTALL_STRIP_PROGRAM
   6.489 -mkdir_p
   6.490 -AWK
   6.491 -SET_MAKE
   6.492 -am__leading_dot
   6.493 -AMTAR
   6.494 -am__tar
   6.495 -am__untar
   6.496 -DEPDIR
   6.497 -am__include
   6.498 -am__quote
   6.499 -AMDEP_TRUE
   6.500 -AMDEP_FALSE
   6.501 -AMDEPBACKSLASH
   6.502 -CCDEPMODE
   6.503 -am__fastdepCC_TRUE
   6.504 -am__fastdepCC_FALSE
   6.505 -OBJC
   6.506 -OBJCFLAGS
   6.507 -ac_ct_OBJC
   6.508 -OBJCDEPMODE
   6.509 -am__fastdepOBJC_TRUE
   6.510 -am__fastdepOBJC_FALSE
   6.511 -WINDRES
   6.512 -USE_IMAGEIO_TRUE
   6.513 -USE_IMAGEIO_FALSE
   6.514 -USE_VERSION_RC_TRUE
   6.515 -USE_VERSION_RC_FALSE
   6.516 -SDL_VERSION
   6.517 -PKG_CONFIG
   6.518 -SDL_CFLAGS
   6.519 -SDL_LIBS
   6.520 -SDL_CONFIG
   6.521 -LIBPNG_CFLAGS
   6.522 -LIBPNG_LIBS
   6.523 -LIBWEBP_CFLAGS
   6.524 -LIBWEBP_LIBS
   6.525 -IMG_LIBS
   6.526 -LIBOBJS
   6.527 -LTLIBOBJS'
   6.528 +SHELL'
   6.529  ac_subst_files=''
   6.530 +ac_user_opts='
   6.531 +enable_option_checking
   6.532 +enable_shared
   6.533 +enable_static
   6.534 +with_pic
   6.535 +enable_fast_install
   6.536 +with_gnu_ld
   6.537 +enable_libtool_lock
   6.538 +enable_dependency_tracking
   6.539 +enable_imageio
   6.540 +with_sdl_prefix
   6.541 +with_sdl_exec_prefix
   6.542 +enable_sdltest
   6.543 +enable_bmp
   6.544 +enable_gif
   6.545 +enable_jpg
   6.546 +enable_jpg_shared
   6.547 +enable_lbm
   6.548 +enable_pcx
   6.549 +enable_png
   6.550 +enable_png_shared
   6.551 +enable_pnm
   6.552 +enable_tga
   6.553 +enable_tif
   6.554 +enable_tif_shared
   6.555 +enable_xcf
   6.556 +enable_xpm
   6.557 +enable_xv
   6.558 +enable_webp
   6.559 +enable_webp_shared
   6.560 +'
   6.561        ac_precious_vars='build_alias
   6.562  host_alias
   6.563  target_alias
   6.564 @@ -923,6 +979,8 @@
   6.565  # Initialize some variables set by options.
   6.566  ac_init_help=
   6.567  ac_init_version=false
   6.568 +ac_unrecognized_opts=
   6.569 +ac_unrecognized_sep=
   6.570  # The variables have the same names as the options, with
   6.571  # dashes changed to underlines.
   6.572  cache_file=/dev/null
   6.573 @@ -1021,13 +1079,21 @@
   6.574      datarootdir=$ac_optarg ;;
   6.575  
   6.576    -disable-* | --disable-*)
   6.577 -    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
   6.578 +    ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
   6.579      # Reject names that are not valid shell variable names.
   6.580 -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.581 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
   6.582 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   6.583 +      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
   6.584     { (exit 1); exit 1; }; }
   6.585 -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
   6.586 -    eval enable_$ac_feature=no ;;
   6.587 +    ac_useropt_orig=$ac_useropt
   6.588 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   6.589 +    case $ac_user_opts in
   6.590 +      *"
   6.591 +"enable_$ac_useropt"
   6.592 +"*) ;;
   6.593 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
   6.594 +	 ac_unrecognized_sep=', ';;
   6.595 +    esac
   6.596 +    eval enable_$ac_useropt=no ;;
   6.597  
   6.598    -docdir | --docdir | --docdi | --doc | --do)
   6.599      ac_prev=docdir ;;
   6.600 @@ -1040,13 +1106,21 @@
   6.601      dvidir=$ac_optarg ;;
   6.602  
   6.603    -enable-* | --enable-*)
   6.604 -    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
   6.605 +    ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
   6.606      # Reject names that are not valid shell variable names.
   6.607 -    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.608 -      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
   6.609 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   6.610 +      { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
   6.611     { (exit 1); exit 1; }; }
   6.612 -    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
   6.613 -    eval enable_$ac_feature=\$ac_optarg ;;
   6.614 +    ac_useropt_orig=$ac_useropt
   6.615 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   6.616 +    case $ac_user_opts in
   6.617 +      *"
   6.618 +"enable_$ac_useropt"
   6.619 +"*) ;;
   6.620 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
   6.621 +	 ac_unrecognized_sep=', ';;
   6.622 +    esac
   6.623 +    eval enable_$ac_useropt=\$ac_optarg ;;
   6.624  
   6.625    -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
   6.626    | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
   6.627 @@ -1237,22 +1311,38 @@
   6.628      ac_init_version=: ;;
   6.629  
   6.630    -with-* | --with-*)
   6.631 -    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
   6.632 +    ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
   6.633      # Reject names that are not valid shell variable names.
   6.634 -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.635 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
   6.636 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   6.637 +      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
   6.638     { (exit 1); exit 1; }; }
   6.639 -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
   6.640 -    eval with_$ac_package=\$ac_optarg ;;
   6.641 +    ac_useropt_orig=$ac_useropt
   6.642 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   6.643 +    case $ac_user_opts in
   6.644 +      *"
   6.645 +"with_$ac_useropt"
   6.646 +"*) ;;
   6.647 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
   6.648 +	 ac_unrecognized_sep=', ';;
   6.649 +    esac
   6.650 +    eval with_$ac_useropt=\$ac_optarg ;;
   6.651  
   6.652    -without-* | --without-*)
   6.653 -    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
   6.654 +    ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
   6.655      # Reject names that are not valid shell variable names.
   6.656 -    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.657 -      { echo "$as_me: error: invalid package name: $ac_package" >&2
   6.658 +    expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
   6.659 +      { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
   6.660     { (exit 1); exit 1; }; }
   6.661 -    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
   6.662 -    eval with_$ac_package=no ;;
   6.663 +    ac_useropt_orig=$ac_useropt
   6.664 +    ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
   6.665 +    case $ac_user_opts in
   6.666 +      *"
   6.667 +"with_$ac_useropt"
   6.668 +"*) ;;
   6.669 +      *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
   6.670 +	 ac_unrecognized_sep=', ';;
   6.671 +    esac
   6.672 +    eval with_$ac_useropt=no ;;
   6.673  
   6.674    --x)
   6.675      # Obsolete; use --with-x.
   6.676 @@ -1272,7 +1362,7 @@
   6.677    | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
   6.678      x_libraries=$ac_optarg ;;
   6.679  
   6.680 -  -*) { echo "$as_me: error: unrecognized option: $ac_option
   6.681 +  -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
   6.682  Try \`$0 --help' for more information." >&2
   6.683     { (exit 1); exit 1; }; }
   6.684      ;;
   6.685 @@ -1281,16 +1371,16 @@
   6.686      ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
   6.687      # Reject names that are not valid shell variable names.
   6.688      expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
   6.689 -      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
   6.690 +      { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
   6.691     { (exit 1); exit 1; }; }
   6.692      eval $ac_envvar=\$ac_optarg
   6.693      export $ac_envvar ;;
   6.694  
   6.695    *)
   6.696      # FIXME: should be removed in autoconf 3.0.
   6.697 -    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
   6.698 +    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
   6.699      expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
   6.700 -      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
   6.701 +      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
   6.702      : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
   6.703      ;;
   6.704  
   6.705 @@ -1299,22 +1389,38 @@
   6.706  
   6.707  if test -n "$ac_prev"; then
   6.708    ac_option=--`echo $ac_prev | sed 's/_/-/g'`
   6.709 -  { echo "$as_me: error: missing argument to $ac_option" >&2
   6.710 +  { $as_echo "$as_me: error: missing argument to $ac_option" >&2
   6.711     { (exit 1); exit 1; }; }
   6.712  fi
   6.713  
   6.714 -# Be sure to have absolute directory names.
   6.715 +if test -n "$ac_unrecognized_opts"; then
   6.716 +  case $enable_option_checking in
   6.717 +    no) ;;
   6.718 +    fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
   6.719 +   { (exit 1); exit 1; }; } ;;
   6.720 +    *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
   6.721 +  esac
   6.722 +fi
   6.723 +
   6.724 +# Check all directory arguments for consistency.
   6.725  for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
   6.726  		datadir sysconfdir sharedstatedir localstatedir includedir \
   6.727  		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
   6.728  		libdir localedir mandir
   6.729  do
   6.730    eval ac_val=\$$ac_var
   6.731 +  # Remove trailing slashes.
   6.732 +  case $ac_val in
   6.733 +    */ )
   6.734 +      ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
   6.735 +      eval $ac_var=\$ac_val;;
   6.736 +  esac
   6.737 +  # Be sure to have absolute directory names.
   6.738    case $ac_val in
   6.739      [\\/$]* | ?:[\\/]* )  continue;;
   6.740      NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
   6.741    esac
   6.742 -  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
   6.743 +  { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
   6.744     { (exit 1); exit 1; }; }
   6.745  done
   6.746  
   6.747 @@ -1329,7 +1435,7 @@
   6.748  if test "x$host_alias" != x; then
   6.749    if test "x$build_alias" = x; then
   6.750      cross_compiling=maybe
   6.751 -    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
   6.752 +    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
   6.753      If a cross compiler is detected then cross compile mode will be used." >&2
   6.754    elif test "x$build_alias" != "x$host_alias"; then
   6.755      cross_compiling=yes
   6.756 @@ -1345,10 +1451,10 @@
   6.757  ac_pwd=`pwd` && test -n "$ac_pwd" &&
   6.758  ac_ls_di=`ls -di .` &&
   6.759  ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
   6.760 -  { echo "$as_me: error: Working directory cannot be determined" >&2
   6.761 +  { $as_echo "$as_me: error: working directory cannot be determined" >&2
   6.762     { (exit 1); exit 1; }; }
   6.763  test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
   6.764 -  { echo "$as_me: error: pwd does not report name of working directory" >&2
   6.765 +  { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
   6.766     { (exit 1); exit 1; }; }
   6.767  
   6.768  
   6.769 @@ -1356,12 +1462,12 @@
   6.770  if test -z "$srcdir"; then
   6.771    ac_srcdir_defaulted=yes
   6.772    # Try the directory containing this script, then the parent directory.
   6.773 -  ac_confdir=`$as_dirname -- "$0" ||
   6.774 -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
   6.775 -	 X"$0" : 'X\(//\)[^/]' \| \
   6.776 -	 X"$0" : 'X\(//\)$' \| \
   6.777 -	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
   6.778 -echo X"$0" |
   6.779 +  ac_confdir=`$as_dirname -- "$as_myself" ||
   6.780 +$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
   6.781 +	 X"$as_myself" : 'X\(//\)[^/]' \| \
   6.782 +	 X"$as_myself" : 'X\(//\)$' \| \
   6.783 +	 X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
   6.784 +$as_echo X"$as_myself" |
   6.785      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
   6.786  	    s//\1/
   6.787  	    q
   6.788 @@ -1388,12 +1494,12 @@
   6.789  fi
   6.790  if test ! -r "$srcdir/$ac_unique_file"; then
   6.791    test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
   6.792 -  { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
   6.793 +  { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
   6.794     { (exit 1); exit 1; }; }
   6.795  fi
   6.796  ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
   6.797  ac_abs_confdir=`(
   6.798 -	cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
   6.799 +	cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
   6.800     { (exit 1); exit 1; }; }
   6.801  	pwd)`
   6.802  # When building in place, set srcdir=.
   6.803 @@ -1442,9 +1548,9 @@
   6.804  
   6.805  Installation directories:
   6.806    --prefix=PREFIX         install architecture-independent files in PREFIX
   6.807 -			  [$ac_default_prefix]
   6.808 +                          [$ac_default_prefix]
   6.809    --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
   6.810 -			  [PREFIX]
   6.811 +                          [PREFIX]
   6.812  
   6.813  By default, \`make install' will install all the files in
   6.814  \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
   6.815 @@ -1454,25 +1560,25 @@
   6.816  For better control, use the options below.
   6.817  
   6.818  Fine tuning of the installation directories:
   6.819 -  --bindir=DIR           user executables [EPREFIX/bin]
   6.820 -  --sbindir=DIR          system admin executables [EPREFIX/sbin]
   6.821 -  --libexecdir=DIR       program executables [EPREFIX/libexec]
   6.822 -  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
   6.823 -  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
   6.824 -  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
   6.825 -  --libdir=DIR           object code libraries [EPREFIX/lib]
   6.826 -  --includedir=DIR       C header files [PREFIX/include]
   6.827 -  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
   6.828 -  --datarootdir=DIR      read-only arch.-independent data root [PREFIX/share]
   6.829 -  --datadir=DIR          read-only architecture-independent data [DATAROOTDIR]
   6.830 -  --infodir=DIR          info documentation [DATAROOTDIR/info]
   6.831 -  --localedir=DIR        locale-dependent data [DATAROOTDIR/locale]
   6.832 -  --mandir=DIR           man documentation [DATAROOTDIR/man]
   6.833 -  --docdir=DIR           documentation root [DATAROOTDIR/doc/PACKAGE]
   6.834 -  --htmldir=DIR          html documentation [DOCDIR]
   6.835 -  --dvidir=DIR           dvi documentation [DOCDIR]
   6.836 -  --pdfdir=DIR           pdf documentation [DOCDIR]
   6.837 -  --psdir=DIR            ps documentation [DOCDIR]
   6.838 +  --bindir=DIR            user executables [EPREFIX/bin]
   6.839 +  --sbindir=DIR           system admin executables [EPREFIX/sbin]
   6.840 +  --libexecdir=DIR        program executables [EPREFIX/libexec]
   6.841 +  --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   6.842 +  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   6.843 +  --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
   6.844 +  --libdir=DIR            object code libraries [EPREFIX/lib]
   6.845 +  --includedir=DIR        C header files [PREFIX/include]
   6.846 +  --oldincludedir=DIR     C header files for non-gcc [/usr/include]
   6.847 +  --datarootdir=DIR       read-only arch.-independent data root [PREFIX/share]
   6.848 +  --datadir=DIR           read-only architecture-independent data [DATAROOTDIR]
   6.849 +  --infodir=DIR           info documentation [DATAROOTDIR/info]
   6.850 +  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
   6.851 +  --mandir=DIR            man documentation [DATAROOTDIR/man]
   6.852 +  --docdir=DIR            documentation root [DATAROOTDIR/doc/PACKAGE]
   6.853 +  --htmldir=DIR           html documentation [DOCDIR]
   6.854 +  --dvidir=DIR            dvi documentation [DOCDIR]
   6.855 +  --pdfdir=DIR            pdf documentation [DOCDIR]
   6.856 +  --psdir=DIR             ps documentation [DOCDIR]
   6.857  _ACEOF
   6.858  
   6.859    cat <<\_ACEOF
   6.860 @@ -1493,6 +1599,7 @@
   6.861    cat <<\_ACEOF
   6.862  
   6.863  Optional Features:
   6.864 +  --disable-option-checking  ignore unrecognized --enable/--with options
   6.865    --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   6.866    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   6.867    --enable-shared[=PKGS]  build shared libraries [default=yes]
   6.868 @@ -1564,15 +1671,17 @@
   6.869  if test "$ac_init_help" = "recursive"; then
   6.870    # If there are subdirs, report their specific --help.
   6.871    for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
   6.872 -    test -d "$ac_dir" || continue
   6.873 +    test -d "$ac_dir" ||
   6.874 +      { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
   6.875 +      continue
   6.876      ac_builddir=.
   6.877  
   6.878  case "$ac_dir" in
   6.879  .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
   6.880  *)
   6.881 -  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
   6.882 +  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
   6.883    # A ".." for each directory in $ac_dir_suffix.
   6.884 -  ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
   6.885 +  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
   6.886    case $ac_top_builddir_sub in
   6.887    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
   6.888    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
   6.889 @@ -1608,7 +1717,7 @@
   6.890        echo &&
   6.891        $SHELL "$ac_srcdir/configure" --help=recursive
   6.892      else
   6.893 -      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
   6.894 +      $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
   6.895      fi || ac_status=$?
   6.896      cd "$ac_pwd" || { ac_status=$?; break; }
   6.897    done
   6.898 @@ -1618,10 +1727,10 @@
   6.899  if $ac_init_version; then
   6.900    cat <<\_ACEOF
   6.901  configure
   6.902 -generated by GNU Autoconf 2.61
   6.903 +generated by GNU Autoconf 2.63
   6.904  
   6.905  Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
   6.906 -2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
   6.907 +2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
   6.908  This configure script is free software; the Free Software Foundation
   6.909  gives unlimited permission to copy, distribute and modify it.
   6.910  _ACEOF
   6.911 @@ -1632,7 +1741,7 @@
   6.912  running configure, to aid debugging if configure makes a mistake.
   6.913  
   6.914  It was created by $as_me, which was
   6.915 -generated by GNU Autoconf 2.61.  Invocation command line was
   6.916 +generated by GNU Autoconf 2.63.  Invocation command line was
   6.917  
   6.918    $ $0 $@
   6.919  
   6.920 @@ -1668,7 +1777,7 @@
   6.921  do
   6.922    IFS=$as_save_IFS
   6.923    test -z "$as_dir" && as_dir=.
   6.924 -  echo "PATH: $as_dir"
   6.925 +  $as_echo "PATH: $as_dir"
   6.926  done
   6.927  IFS=$as_save_IFS
   6.928  
   6.929 @@ -1703,7 +1812,7 @@
   6.930      | -silent | --silent | --silen | --sile | --sil)
   6.931        continue ;;
   6.932      *\'*)
   6.933 -      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   6.934 +      ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
   6.935      esac
   6.936      case $ac_pass in
   6.937      1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
   6.938 @@ -1755,11 +1864,12 @@
   6.939      case $ac_val in #(
   6.940      *${as_nl}*)
   6.941        case $ac_var in #(
   6.942 -      *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
   6.943 -echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
   6.944 +      *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
   6.945 +$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
   6.946        esac
   6.947        case $ac_var in #(
   6.948        _ | IFS | as_nl) ;; #(
   6.949 +      BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
   6.950        *) $as_unset $ac_var ;;
   6.951        esac ;;
   6.952      esac
   6.953 @@ -1789,9 +1899,9 @@
   6.954      do
   6.955        eval ac_val=\$$ac_var
   6.956        case $ac_val in
   6.957 -      *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
   6.958 +      *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
   6.959        esac
   6.960 -      echo "$ac_var='\''$ac_val'\''"
   6.961 +      $as_echo "$ac_var='\''$ac_val'\''"
   6.962      done | sort
   6.963      echo
   6.964  
   6.965 @@ -1806,9 +1916,9 @@
   6.966        do
   6.967  	eval ac_val=\$$ac_var
   6.968  	case $ac_val in
   6.969 -	*\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
   6.970 +	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
   6.971  	esac
   6.972 -	echo "$ac_var='\''$ac_val'\''"
   6.973 +	$as_echo "$ac_var='\''$ac_val'\''"
   6.974        done | sort
   6.975        echo
   6.976      fi
   6.977 @@ -1824,8 +1934,8 @@
   6.978        echo
   6.979      fi
   6.980      test "$ac_signal" != 0 &&
   6.981 -      echo "$as_me: caught signal $ac_signal"
   6.982 -    echo "$as_me: exit $exit_status"
   6.983 +      $as_echo "$as_me: caught signal $ac_signal"
   6.984 +    $as_echo "$as_me: exit $exit_status"
   6.985    } >&5
   6.986    rm -f core *.core core.conftest.* &&
   6.987      rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
   6.988 @@ -1867,21 +1977,24 @@
   6.989  
   6.990  
   6.991  # Let the site file select an alternate cache file if it wants to.
   6.992 -# Prefer explicitly selected file to automatically selected ones.
   6.993 +# Prefer an explicitly selected file to automatically selected ones.
   6.994 +ac_site_file1=NONE
   6.995 +ac_site_file2=NONE
   6.996  if test -n "$CONFIG_SITE"; then
   6.997 -  set x "$CONFIG_SITE"
   6.998 +  ac_site_file1=$CONFIG_SITE
   6.999  elif test "x$prefix" != xNONE; then
  6.1000 -  set x "$prefix/share/config.site" "$prefix/etc/config.site"
  6.1001 -else
  6.1002 -  set x "$ac_default_prefix/share/config.site" \
  6.1003 -	"$ac_default_prefix/etc/config.site"
  6.1004 -fi
  6.1005 -shift
  6.1006 -for ac_site_file
  6.1007 -do
  6.1008 +  ac_site_file1=$prefix/share/config.site
  6.1009 +  ac_site_file2=$prefix/etc/config.site
  6.1010 +else
  6.1011 +  ac_site_file1=$ac_default_prefix/share/config.site
  6.1012 +  ac_site_file2=$ac_default_prefix/etc/config.site
  6.1013 +fi
  6.1014 +for ac_site_file in "$ac_site_file1" "$ac_site_file2"
  6.1015 +do
  6.1016 +  test "x$ac_site_file" = xNONE && continue
  6.1017    if test -r "$ac_site_file"; then
  6.1018 -    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  6.1019 -echo "$as_me: loading site script $ac_site_file" >&6;}
  6.1020 +    { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
  6.1021 +$as_echo "$as_me: loading site script $ac_site_file" >&6;}
  6.1022      sed 's/^/| /' "$ac_site_file" >&5
  6.1023      . "$ac_site_file"
  6.1024    fi
  6.1025 @@ -1891,16 +2004,16 @@
  6.1026    # Some versions of bash will fail to source /dev/null (special
  6.1027    # files actually), so we avoid doing that.
  6.1028    if test -f "$cache_file"; then
  6.1029 -    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
  6.1030 -echo "$as_me: loading cache $cache_file" >&6;}
  6.1031 +    { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
  6.1032 +$as_echo "$as_me: loading cache $cache_file" >&6;}
  6.1033      case $cache_file in
  6.1034        [\\/]* | ?:[\\/]* ) . "$cache_file";;
  6.1035        *)                      . "./$cache_file";;
  6.1036      esac
  6.1037    fi
  6.1038  else
  6.1039 -  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
  6.1040 -echo "$as_me: creating cache $cache_file" >&6;}
  6.1041 +  { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
  6.1042 +$as_echo "$as_me: creating cache $cache_file" >&6;}
  6.1043    >$cache_file
  6.1044  fi
  6.1045  
  6.1046 @@ -1914,29 +2027,38 @@
  6.1047    eval ac_new_val=\$ac_env_${ac_var}_value
  6.1048    case $ac_old_set,$ac_new_set in
  6.1049      set,)
  6.1050 -      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  6.1051 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
  6.1052 +      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
  6.1053 +$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
  6.1054        ac_cache_corrupted=: ;;
  6.1055      ,set)
  6.1056 -      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
  6.1057 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
  6.1058 +      { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
  6.1059 +$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
  6.1060        ac_cache_corrupted=: ;;
  6.1061      ,);;
  6.1062      *)
  6.1063        if test "x$ac_old_val" != "x$ac_new_val"; then
  6.1064 -	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  6.1065 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  6.1066 -	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
  6.1067 -echo "$as_me:   former value:  $ac_old_val" >&2;}
  6.1068 -	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
  6.1069 -echo "$as_me:   current value: $ac_new_val" >&2;}
  6.1070 -	ac_cache_corrupted=:
  6.1071 +	# differences in whitespace do not lead to failure.
  6.1072 +	ac_old_val_w=`echo x $ac_old_val`
  6.1073 +	ac_new_val_w=`echo x $ac_new_val`
  6.1074 +	if test "$ac_old_val_w" != "$ac_new_val_w"; then
  6.1075 +	  { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
  6.1076 +$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
  6.1077 +	  ac_cache_corrupted=:
  6.1078 +	else
  6.1079 +	  { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
  6.1080 +$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
  6.1081 +	  eval $ac_var=\$ac_old_val
  6.1082 +	fi
  6.1083 +	{ $as_echo "$as_me:$LINENO:   former value:  \`$ac_old_val'" >&5
  6.1084 +$as_echo "$as_me:   former value:  \`$ac_old_val'" >&2;}
  6.1085 +	{ $as_echo "$as_me:$LINENO:   current value: \`$ac_new_val'" >&5
  6.1086 +$as_echo "$as_me:   current value: \`$ac_new_val'" >&2;}
  6.1087        fi;;
  6.1088    esac
  6.1089    # Pass precious variables to config.status.
  6.1090    if test "$ac_new_set" = set; then
  6.1091      case $ac_new_val in
  6.1092 -    *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
  6.1093 +    *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
  6.1094      *) ac_arg=$ac_var=$ac_new_val ;;
  6.1095      esac
  6.1096      case " $ac_configure_args " in
  6.1097 @@ -1946,10 +2068,12 @@
  6.1098    fi
  6.1099  done
  6.1100  if $ac_cache_corrupted; then
  6.1101 -  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  6.1102 -echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  6.1103 -  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  6.1104 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
  6.1105 +  { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1106 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1107 +  { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
  6.1108 +$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
  6.1109 +  { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
  6.1110 +$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
  6.1111     { (exit 1); exit 1; }; }
  6.1112  fi
  6.1113  
  6.1114 @@ -2003,8 +2127,8 @@
  6.1115  # libtool versioning
  6.1116  case `pwd` in
  6.1117    *\ * | *\	*)
  6.1118 -    { echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
  6.1119 -echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  6.1120 +    { $as_echo "$as_me:$LINENO: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
  6.1121 +$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
  6.1122  esac
  6.1123  
  6.1124  
  6.1125 @@ -2043,8 +2167,8 @@
  6.1126    fi
  6.1127  done
  6.1128  if test -z "$ac_aux_dir"; then
  6.1129 -  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
  6.1130 -echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
  6.1131 +  { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5
  6.1132 +$as_echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;}
  6.1133     { (exit 1); exit 1; }; }
  6.1134  fi
  6.1135  
  6.1136 @@ -2059,34 +2183,34 @@
  6.1137  
  6.1138  # Make sure we can run config.sub.
  6.1139  $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  6.1140 -  { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
  6.1141 -echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
  6.1142 +  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
  6.1143 +$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
  6.1144     { (exit 1); exit 1; }; }
  6.1145  
  6.1146 -{ echo "$as_me:$LINENO: checking build system type" >&5
  6.1147 -echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
  6.1148 +{ $as_echo "$as_me:$LINENO: checking build system type" >&5
  6.1149 +$as_echo_n "checking build system type... " >&6; }
  6.1150  if test "${ac_cv_build+set}" = set; then
  6.1151 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1152 +  $as_echo_n "(cached) " >&6
  6.1153  else
  6.1154    ac_build_alias=$build_alias
  6.1155  test "x$ac_build_alias" = x &&
  6.1156    ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
  6.1157  test "x$ac_build_alias" = x &&
  6.1158 -  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
  6.1159 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
  6.1160 +  { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
  6.1161 +$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
  6.1162     { (exit 1); exit 1; }; }
  6.1163  ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
  6.1164 -  { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
  6.1165 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
  6.1166 +  { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
  6.1167 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
  6.1168     { (exit 1); exit 1; }; }
  6.1169  
  6.1170  fi
  6.1171 -{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
  6.1172 -echo "${ECHO_T}$ac_cv_build" >&6; }
  6.1173 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
  6.1174 +$as_echo "$ac_cv_build" >&6; }
  6.1175  case $ac_cv_build in
  6.1176  *-*-*) ;;
  6.1177 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
  6.1178 -echo "$as_me: error: invalid value of canonical build" >&2;}
  6.1179 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
  6.1180 +$as_echo "$as_me: error: invalid value of canonical build" >&2;}
  6.1181     { (exit 1); exit 1; }; };;
  6.1182  esac
  6.1183  build=$ac_cv_build
  6.1184 @@ -2103,27 +2227,27 @@
  6.1185  case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
  6.1186  
  6.1187  
  6.1188 -{ echo "$as_me:$LINENO: checking host system type" >&5
  6.1189 -echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
  6.1190 +{ $as_echo "$as_me:$LINENO: checking host system type" >&5
  6.1191 +$as_echo_n "checking host system type... " >&6; }
  6.1192  if test "${ac_cv_host+set}" = set; then
  6.1193 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1194 +  $as_echo_n "(cached) " >&6
  6.1195  else
  6.1196    if test "x$host_alias" = x; then
  6.1197    ac_cv_host=$ac_cv_build
  6.1198  else
  6.1199    ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
  6.1200 -    { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
  6.1201 -echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
  6.1202 +    { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
  6.1203 +$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
  6.1204     { (exit 1); exit 1; }; }
  6.1205  fi
  6.1206  
  6.1207  fi
  6.1208 -{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
  6.1209 -echo "${ECHO_T}$ac_cv_host" >&6; }
  6.1210 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
  6.1211 +$as_echo "$ac_cv_host" >&6; }
  6.1212  case $ac_cv_host in
  6.1213  *-*-*) ;;
  6.1214 -*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
  6.1215 -echo "$as_me: error: invalid value of canonical host" >&2;}
  6.1216 +*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
  6.1217 +$as_echo "$as_me: error: invalid value of canonical host" >&2;}
  6.1218     { (exit 1); exit 1; }; };;
  6.1219  esac
  6.1220  host=$ac_cv_host
  6.1221 @@ -2148,10 +2272,10 @@
  6.1222  if test -n "$ac_tool_prefix"; then
  6.1223    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  6.1224  set dummy ${ac_tool_prefix}gcc; ac_word=$2
  6.1225 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1226 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1227 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1228 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1229  if test "${ac_cv_prog_CC+set}" = set; then
  6.1230 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1231 +  $as_echo_n "(cached) " >&6
  6.1232  else
  6.1233    if test -n "$CC"; then
  6.1234    ac_cv_prog_CC="$CC" # Let the user override the test.
  6.1235 @@ -2164,7 +2288,7 @@
  6.1236    for ac_exec_ext in '' $ac_executable_extensions; do
  6.1237    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1238      ac_cv_prog_CC="${ac_tool_prefix}gcc"
  6.1239 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1240 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1241      break 2
  6.1242    fi
  6.1243  done
  6.1244 @@ -2175,11 +2299,11 @@
  6.1245  fi
  6.1246  CC=$ac_cv_prog_CC
  6.1247  if test -n "$CC"; then
  6.1248 -  { echo "$as_me:$LINENO: result: $CC" >&5
  6.1249 -echo "${ECHO_T}$CC" >&6; }
  6.1250 -else
  6.1251 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1252 -echo "${ECHO_T}no" >&6; }
  6.1253 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  6.1254 +$as_echo "$CC" >&6; }
  6.1255 +else
  6.1256 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1257 +$as_echo "no" >&6; }
  6.1258  fi
  6.1259  
  6.1260  
  6.1261 @@ -2188,10 +2312,10 @@
  6.1262    ac_ct_CC=$CC
  6.1263    # Extract the first word of "gcc", so it can be a program name with args.
  6.1264  set dummy gcc; ac_word=$2
  6.1265 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1266 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1267 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1268 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1269  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
  6.1270 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1271 +  $as_echo_n "(cached) " >&6
  6.1272  else
  6.1273    if test -n "$ac_ct_CC"; then
  6.1274    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  6.1275 @@ -2204,7 +2328,7 @@
  6.1276    for ac_exec_ext in '' $ac_executable_extensions; do
  6.1277    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1278      ac_cv_prog_ac_ct_CC="gcc"
  6.1279 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1280 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1281      break 2
  6.1282    fi
  6.1283  done
  6.1284 @@ -2215,11 +2339,11 @@
  6.1285  fi
  6.1286  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  6.1287  if test -n "$ac_ct_CC"; then
  6.1288 -  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  6.1289 -echo "${ECHO_T}$ac_ct_CC" >&6; }
  6.1290 -else
  6.1291 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1292 -echo "${ECHO_T}no" >&6; }
  6.1293 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  6.1294 +$as_echo "$ac_ct_CC" >&6; }
  6.1295 +else
  6.1296 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1297 +$as_echo "no" >&6; }
  6.1298  fi
  6.1299  
  6.1300    if test "x$ac_ct_CC" = x; then
  6.1301 @@ -2227,12 +2351,8 @@
  6.1302    else
  6.1303      case $cross_compiling:$ac_tool_warned in
  6.1304  yes:)
  6.1305 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.1306 -whose name does not start with the host triplet.  If you think this
  6.1307 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.1308 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.1309 -whose name does not start with the host triplet.  If you think this
  6.1310 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.1311 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.1312 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.1313  ac_tool_warned=yes ;;
  6.1314  esac
  6.1315      CC=$ac_ct_CC
  6.1316 @@ -2245,10 +2365,10 @@
  6.1317            if test -n "$ac_tool_prefix"; then
  6.1318      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  6.1319  set dummy ${ac_tool_prefix}cc; ac_word=$2
  6.1320 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1321 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1322 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1323 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1324  if test "${ac_cv_prog_CC+set}" = set; then
  6.1325 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1326 +  $as_echo_n "(cached) " >&6
  6.1327  else
  6.1328    if test -n "$CC"; then
  6.1329    ac_cv_prog_CC="$CC" # Let the user override the test.
  6.1330 @@ -2261,7 +2381,7 @@
  6.1331    for ac_exec_ext in '' $ac_executable_extensions; do
  6.1332    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1333      ac_cv_prog_CC="${ac_tool_prefix}cc"
  6.1334 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1335 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1336      break 2
  6.1337    fi
  6.1338  done
  6.1339 @@ -2272,11 +2392,11 @@
  6.1340  fi
  6.1341  CC=$ac_cv_prog_CC
  6.1342  if test -n "$CC"; then
  6.1343 -  { echo "$as_me:$LINENO: result: $CC" >&5
  6.1344 -echo "${ECHO_T}$CC" >&6; }
  6.1345 -else
  6.1346 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1347 -echo "${ECHO_T}no" >&6; }
  6.1348 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  6.1349 +$as_echo "$CC" >&6; }
  6.1350 +else
  6.1351 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1352 +$as_echo "no" >&6; }
  6.1353  fi
  6.1354  
  6.1355  
  6.1356 @@ -2285,10 +2405,10 @@
  6.1357  if test -z "$CC"; then
  6.1358    # Extract the first word of "cc", so it can be a program name with args.
  6.1359  set dummy cc; ac_word=$2
  6.1360 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1361 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1362 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1363 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1364  if test "${ac_cv_prog_CC+set}" = set; then
  6.1365 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1366 +  $as_echo_n "(cached) " >&6
  6.1367  else
  6.1368    if test -n "$CC"; then
  6.1369    ac_cv_prog_CC="$CC" # Let the user override the test.
  6.1370 @@ -2306,7 +2426,7 @@
  6.1371         continue
  6.1372       fi
  6.1373      ac_cv_prog_CC="cc"
  6.1374 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1375 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1376      break 2
  6.1377    fi
  6.1378  done
  6.1379 @@ -2329,11 +2449,11 @@
  6.1380  fi
  6.1381  CC=$ac_cv_prog_CC
  6.1382  if test -n "$CC"; then
  6.1383 -  { echo "$as_me:$LINENO: result: $CC" >&5
  6.1384 -echo "${ECHO_T}$CC" >&6; }
  6.1385 -else
  6.1386 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1387 -echo "${ECHO_T}no" >&6; }
  6.1388 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  6.1389 +$as_echo "$CC" >&6; }
  6.1390 +else
  6.1391 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1392 +$as_echo "no" >&6; }
  6.1393  fi
  6.1394  
  6.1395  
  6.1396 @@ -2344,10 +2464,10 @@
  6.1397    do
  6.1398      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  6.1399  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.1400 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1401 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1402 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1403 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1404  if test "${ac_cv_prog_CC+set}" = set; then
  6.1405 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1406 +  $as_echo_n "(cached) " >&6
  6.1407  else
  6.1408    if test -n "$CC"; then
  6.1409    ac_cv_prog_CC="$CC" # Let the user override the test.
  6.1410 @@ -2360,7 +2480,7 @@
  6.1411    for ac_exec_ext in '' $ac_executable_extensions; do
  6.1412    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1413      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
  6.1414 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1415 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1416      break 2
  6.1417    fi
  6.1418  done
  6.1419 @@ -2371,11 +2491,11 @@
  6.1420  fi
  6.1421  CC=$ac_cv_prog_CC
  6.1422  if test -n "$CC"; then
  6.1423 -  { echo "$as_me:$LINENO: result: $CC" >&5
  6.1424 -echo "${ECHO_T}$CC" >&6; }
  6.1425 -else
  6.1426 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1427 -echo "${ECHO_T}no" >&6; }
  6.1428 +  { $as_echo "$as_me:$LINENO: result: $CC" >&5
  6.1429 +$as_echo "$CC" >&6; }
  6.1430 +else
  6.1431 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1432 +$as_echo "no" >&6; }
  6.1433  fi
  6.1434  
  6.1435  
  6.1436 @@ -2388,10 +2508,10 @@
  6.1437  do
  6.1438    # Extract the first word of "$ac_prog", so it can be a program name with args.
  6.1439  set dummy $ac_prog; ac_word=$2
  6.1440 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1441 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.1442 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.1443 +$as_echo_n "checking for $ac_word... " >&6; }
  6.1444  if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
  6.1445 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1446 +  $as_echo_n "(cached) " >&6
  6.1447  else
  6.1448    if test -n "$ac_ct_CC"; then
  6.1449    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
  6.1450 @@ -2404,7 +2524,7 @@
  6.1451    for ac_exec_ext in '' $ac_executable_extensions; do
  6.1452    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.1453      ac_cv_prog_ac_ct_CC="$ac_prog"
  6.1454 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1455 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.1456      break 2
  6.1457    fi
  6.1458  done
  6.1459 @@ -2415,11 +2535,11 @@
  6.1460  fi
  6.1461  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  6.1462  if test -n "$ac_ct_CC"; then
  6.1463 -  { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  6.1464 -echo "${ECHO_T}$ac_ct_CC" >&6; }
  6.1465 -else
  6.1466 -  { echo "$as_me:$LINENO: result: no" >&5
  6.1467 -echo "${ECHO_T}no" >&6; }
  6.1468 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
  6.1469 +$as_echo "$ac_ct_CC" >&6; }
  6.1470 +else
  6.1471 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.1472 +$as_echo "no" >&6; }
  6.1473  fi
  6.1474  
  6.1475  
  6.1476 @@ -2431,12 +2551,8 @@
  6.1477    else
  6.1478      case $cross_compiling:$ac_tool_warned in
  6.1479  yes:)
  6.1480 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.1481 -whose name does not start with the host triplet.  If you think this
  6.1482 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.1483 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.1484 -whose name does not start with the host triplet.  If you think this
  6.1485 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.1486 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.1487 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.1488  ac_tool_warned=yes ;;
  6.1489  esac
  6.1490      CC=$ac_ct_CC
  6.1491 @@ -2446,44 +2562,50 @@
  6.1492  fi
  6.1493  
  6.1494  
  6.1495 -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  6.1496 +test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1497 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1498 +{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
  6.1499  See \`config.log' for more details." >&5
  6.1500 -echo "$as_me: error: no acceptable C compiler found in \$PATH
  6.1501 +$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
  6.1502  See \`config.log' for more details." >&2;}
  6.1503 -   { (exit 1); exit 1; }; }
  6.1504 +   { (exit 1); exit 1; }; }; }
  6.1505  
  6.1506  # Provide some information about the compiler.
  6.1507 -echo "$as_me:$LINENO: checking for C compiler version" >&5
  6.1508 -ac_compiler=`set X $ac_compile; echo $2`
  6.1509 +$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
  6.1510 +set X $ac_compile
  6.1511 +ac_compiler=$2
  6.1512  { (ac_try="$ac_compiler --version >&5"
  6.1513  case "(($ac_try" in
  6.1514    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1515    *) ac_try_echo=$ac_try;;
  6.1516  esac
  6.1517 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1518 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1519 +$as_echo "$ac_try_echo") >&5
  6.1520    (eval "$ac_compiler --version >&5") 2>&5
  6.1521    ac_status=$?
  6.1522 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1523 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1524    (exit $ac_status); }
  6.1525  { (ac_try="$ac_compiler -v >&5"
  6.1526  case "(($ac_try" in
  6.1527    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1528    *) ac_try_echo=$ac_try;;
  6.1529  esac
  6.1530 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1531 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1532 +$as_echo "$ac_try_echo") >&5
  6.1533    (eval "$ac_compiler -v >&5") 2>&5
  6.1534    ac_status=$?
  6.1535 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1536 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1537    (exit $ac_status); }
  6.1538  { (ac_try="$ac_compiler -V >&5"
  6.1539  case "(($ac_try" in
  6.1540    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1541    *) ac_try_echo=$ac_try;;
  6.1542  esac
  6.1543 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1544 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1545 +$as_echo "$ac_try_echo") >&5
  6.1546    (eval "$ac_compiler -V >&5") 2>&5
  6.1547    ac_status=$?
  6.1548 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1549 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1550    (exit $ac_status); }
  6.1551  
  6.1552  cat >conftest.$ac_ext <<_ACEOF
  6.1553 @@ -2502,27 +2624,22 @@
  6.1554  }
  6.1555  _ACEOF
  6.1556  ac_clean_files_save=$ac_clean_files
  6.1557 -ac_clean_files="$ac_clean_files a.out a.exe b.out"
  6.1558 +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
  6.1559  # Try to create an executable without -o first, disregard a.out.
  6.1560  # It will help us diagnose broken compilers, and finding out an intuition
  6.1561  # of exeext.
  6.1562 -{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
  6.1563 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
  6.1564 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  6.1565 -#
  6.1566 -# List of possible output files, starting from the most likely.
  6.1567 -# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
  6.1568 -# only as a last resort.  b.out is created by i960 compilers.
  6.1569 -ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
  6.1570 -#
  6.1571 -# The IRIX 6 linker writes into existing files which may not be
  6.1572 -# executable, retaining their permissions.  Remove them first so a
  6.1573 -# subsequent execution test works.
  6.1574 +{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
  6.1575 +$as_echo_n "checking for C compiler default output file name... " >&6; }
  6.1576 +ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  6.1577 +
  6.1578 +# The possible output files:
  6.1579 +ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
  6.1580 +
  6.1581  ac_rmfiles=
  6.1582  for ac_file in $ac_files
  6.1583  do
  6.1584    case $ac_file in
  6.1585 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
  6.1586 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  6.1587      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
  6.1588    esac
  6.1589  done
  6.1590 @@ -2533,10 +2650,11 @@
  6.1591    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1592    *) ac_try_echo=$ac_try;;
  6.1593  esac
  6.1594 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1595 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1596 +$as_echo "$ac_try_echo") >&5
  6.1597    (eval "$ac_link_default") 2>&5
  6.1598    ac_status=$?
  6.1599 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1600 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1601    (exit $ac_status); }; then
  6.1602    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  6.1603  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
  6.1604 @@ -2547,7 +2665,7 @@
  6.1605  do
  6.1606    test -f "$ac_file" || continue
  6.1607    case $ac_file in
  6.1608 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
  6.1609 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
  6.1610  	;;
  6.1611      [ab].out )
  6.1612  	# We found the default executable, but exeext='' is most
  6.1613 @@ -2574,25 +2692,27 @@
  6.1614    ac_file=''
  6.1615  fi
  6.1616  
  6.1617 -{ echo "$as_me:$LINENO: result: $ac_file" >&5
  6.1618 -echo "${ECHO_T}$ac_file" >&6; }
  6.1619 +{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
  6.1620 +$as_echo "$ac_file" >&6; }
  6.1621  if test -z "$ac_file"; then
  6.1622 -  echo "$as_me: failed program was:" >&5
  6.1623 -sed 's/^/| /' conftest.$ac_ext >&5
  6.1624 -
  6.1625 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
  6.1626 +  $as_echo "$as_me: failed program was:" >&5
  6.1627 +sed 's/^/| /' conftest.$ac_ext >&5
  6.1628 +
  6.1629 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1630 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1631 +{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
  6.1632  See \`config.log' for more details." >&5
  6.1633 -echo "$as_me: error: C compiler cannot create executables
  6.1634 +$as_echo "$as_me: error: C compiler cannot create executables
  6.1635  See \`config.log' for more details." >&2;}
  6.1636 -   { (exit 77); exit 77; }; }
  6.1637 +   { (exit 77); exit 77; }; }; }
  6.1638  fi
  6.1639  
  6.1640  ac_exeext=$ac_cv_exeext
  6.1641  
  6.1642  # Check that the compiler produces executables we can run.  If not, either
  6.1643  # the compiler is broken, or we cross compile.
  6.1644 -{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
  6.1645 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
  6.1646 +{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
  6.1647 +$as_echo_n "checking whether the C compiler works... " >&6; }
  6.1648  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  6.1649  # If not cross compiling, check that we can run a simple program.
  6.1650  if test "$cross_compiling" != yes; then
  6.1651 @@ -2601,49 +2721,53 @@
  6.1652    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1653    *) ac_try_echo=$ac_try;;
  6.1654  esac
  6.1655 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1656 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1657 +$as_echo "$ac_try_echo") >&5
  6.1658    (eval "$ac_try") 2>&5
  6.1659    ac_status=$?
  6.1660 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1661 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1662    (exit $ac_status); }; }; then
  6.1663      cross_compiling=no
  6.1664    else
  6.1665      if test "$cross_compiling" = maybe; then
  6.1666  	cross_compiling=yes
  6.1667      else
  6.1668 -	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
  6.1669 +	{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1670 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1671 +{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
  6.1672  If you meant to cross compile, use \`--host'.
  6.1673  See \`config.log' for more details." >&5
  6.1674 -echo "$as_me: error: cannot run C compiled programs.
  6.1675 +$as_echo "$as_me: error: cannot run C compiled programs.
  6.1676  If you meant to cross compile, use \`--host'.
  6.1677  See \`config.log' for more details." >&2;}
  6.1678 -   { (exit 1); exit 1; }; }
  6.1679 +   { (exit 1); exit 1; }; }; }
  6.1680      fi
  6.1681    fi
  6.1682  fi
  6.1683 -{ echo "$as_me:$LINENO: result: yes" >&5
  6.1684 -echo "${ECHO_T}yes" >&6; }
  6.1685 -
  6.1686 -rm -f a.out a.exe conftest$ac_cv_exeext b.out
  6.1687 +{ $as_echo "$as_me:$LINENO: result: yes" >&5
  6.1688 +$as_echo "yes" >&6; }
  6.1689 +
  6.1690 +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
  6.1691  ac_clean_files=$ac_clean_files_save
  6.1692  # Check that the compiler produces executables we can run.  If not, either
  6.1693  # the compiler is broken, or we cross compile.
  6.1694 -{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
  6.1695 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
  6.1696 -{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
  6.1697 -echo "${ECHO_T}$cross_compiling" >&6; }
  6.1698 -
  6.1699 -{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
  6.1700 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
  6.1701 +{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
  6.1702 +$as_echo_n "checking whether we are cross compiling... " >&6; }
  6.1703 +{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
  6.1704 +$as_echo "$cross_compiling" >&6; }
  6.1705 +
  6.1706 +{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
  6.1707 +$as_echo_n "checking for suffix of executables... " >&6; }
  6.1708  if { (ac_try="$ac_link"
  6.1709  case "(($ac_try" in
  6.1710    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1711    *) ac_try_echo=$ac_try;;
  6.1712  esac
  6.1713 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1714 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1715 +$as_echo "$ac_try_echo") >&5
  6.1716    (eval "$ac_link") 2>&5
  6.1717    ac_status=$?
  6.1718 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1719 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1720    (exit $ac_status); }; then
  6.1721    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  6.1722  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
  6.1723 @@ -2652,31 +2776,33 @@
  6.1724  for ac_file in conftest.exe conftest conftest.*; do
  6.1725    test -f "$ac_file" || continue
  6.1726    case $ac_file in
  6.1727 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
  6.1728 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
  6.1729      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
  6.1730  	  break;;
  6.1731      * ) break;;
  6.1732    esac
  6.1733  done
  6.1734  else
  6.1735 -  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  6.1736 +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1737 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1738 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
  6.1739  See \`config.log' for more details." >&5
  6.1740 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  6.1741 +$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
  6.1742  See \`config.log' for more details." >&2;}
  6.1743 -   { (exit 1); exit 1; }; }
  6.1744 +   { (exit 1); exit 1; }; }; }
  6.1745  fi
  6.1746  
  6.1747  rm -f conftest$ac_cv_exeext
  6.1748 -{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
  6.1749 -echo "${ECHO_T}$ac_cv_exeext" >&6; }
  6.1750 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
  6.1751 +$as_echo "$ac_cv_exeext" >&6; }
  6.1752  
  6.1753  rm -f conftest.$ac_ext
  6.1754  EXEEXT=$ac_cv_exeext
  6.1755  ac_exeext=$EXEEXT
  6.1756 -{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
  6.1757 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
  6.1758 +{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
  6.1759 +$as_echo_n "checking for suffix of object files... " >&6; }
  6.1760  if test "${ac_cv_objext+set}" = set; then
  6.1761 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1762 +  $as_echo_n "(cached) " >&6
  6.1763  else
  6.1764    cat >conftest.$ac_ext <<_ACEOF
  6.1765  /* confdefs.h.  */
  6.1766 @@ -2699,40 +2825,43 @@
  6.1767    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1768    *) ac_try_echo=$ac_try;;
  6.1769  esac
  6.1770 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1771 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1772 +$as_echo "$ac_try_echo") >&5
  6.1773    (eval "$ac_compile") 2>&5
  6.1774    ac_status=$?
  6.1775 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1776 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1777    (exit $ac_status); }; then
  6.1778    for ac_file in conftest.o conftest.obj conftest.*; do
  6.1779    test -f "$ac_file" || continue;
  6.1780    case $ac_file in
  6.1781 -    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
  6.1782 +    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
  6.1783      *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
  6.1784         break;;
  6.1785    esac
  6.1786  done
  6.1787  else
  6.1788 -  echo "$as_me: failed program was:" >&5
  6.1789 -sed 's/^/| /' conftest.$ac_ext >&5
  6.1790 -
  6.1791 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  6.1792 +  $as_echo "$as_me: failed program was:" >&5
  6.1793 +sed 's/^/| /' conftest.$ac_ext >&5
  6.1794 +
  6.1795 +{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.1796 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.1797 +{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
  6.1798  See \`config.log' for more details." >&5
  6.1799 -echo "$as_me: error: cannot compute suffix of object files: cannot compile
  6.1800 +$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
  6.1801  See \`config.log' for more details." >&2;}
  6.1802 -   { (exit 1); exit 1; }; }
  6.1803 +   { (exit 1); exit 1; }; }; }
  6.1804  fi
  6.1805  
  6.1806  rm -f conftest.$ac_cv_objext conftest.$ac_ext
  6.1807  fi
  6.1808 -{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
  6.1809 -echo "${ECHO_T}$ac_cv_objext" >&6; }
  6.1810 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
  6.1811 +$as_echo "$ac_cv_objext" >&6; }
  6.1812  OBJEXT=$ac_cv_objext
  6.1813  ac_objext=$OBJEXT
  6.1814 -{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
  6.1815 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
  6.1816 +{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
  6.1817 +$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
  6.1818  if test "${ac_cv_c_compiler_gnu+set}" = set; then
  6.1819 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1820 +  $as_echo_n "(cached) " >&6
  6.1821  else
  6.1822    cat >conftest.$ac_ext <<_ACEOF
  6.1823  /* confdefs.h.  */
  6.1824 @@ -2758,20 +2887,21 @@
  6.1825    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1826    *) ac_try_echo=$ac_try;;
  6.1827  esac
  6.1828 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1829 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1830 +$as_echo "$ac_try_echo") >&5
  6.1831    (eval "$ac_compile") 2>conftest.er1
  6.1832    ac_status=$?
  6.1833    grep -v '^ *+' conftest.er1 >conftest.err
  6.1834    rm -f conftest.er1
  6.1835    cat conftest.err >&5
  6.1836 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1837 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1838    (exit $ac_status); } && {
  6.1839  	 test -z "$ac_c_werror_flag" ||
  6.1840  	 test ! -s conftest.err
  6.1841         } && test -s conftest.$ac_objext; then
  6.1842    ac_compiler_gnu=yes
  6.1843  else
  6.1844 -  echo "$as_me: failed program was:" >&5
  6.1845 +  $as_echo "$as_me: failed program was:" >&5
  6.1846  sed 's/^/| /' conftest.$ac_ext >&5
  6.1847  
  6.1848  	ac_compiler_gnu=no
  6.1849 @@ -2781,15 +2911,19 @@
  6.1850  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  6.1851  
  6.1852  fi
  6.1853 -{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
  6.1854 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
  6.1855 -GCC=`test $ac_compiler_gnu = yes && echo yes`
  6.1856 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
  6.1857 +$as_echo "$ac_cv_c_compiler_gnu" >&6; }
  6.1858 +if test $ac_compiler_gnu = yes; then
  6.1859 +  GCC=yes
  6.1860 +else
  6.1861 +  GCC=
  6.1862 +fi
  6.1863  ac_test_CFLAGS=${CFLAGS+set}
  6.1864  ac_save_CFLAGS=$CFLAGS
  6.1865 -{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
  6.1866 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
  6.1867 +{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
  6.1868 +$as_echo_n "checking whether $CC accepts -g... " >&6; }
  6.1869  if test "${ac_cv_prog_cc_g+set}" = set; then
  6.1870 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1871 +  $as_echo_n "(cached) " >&6
  6.1872  else
  6.1873    ac_save_c_werror_flag=$ac_c_werror_flag
  6.1874     ac_c_werror_flag=yes
  6.1875 @@ -2816,20 +2950,21 @@
  6.1876    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1877    *) ac_try_echo=$ac_try;;
  6.1878  esac
  6.1879 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1880 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1881 +$as_echo "$ac_try_echo") >&5
  6.1882    (eval "$ac_compile") 2>conftest.er1
  6.1883    ac_status=$?
  6.1884    grep -v '^ *+' conftest.er1 >conftest.err
  6.1885    rm -f conftest.er1
  6.1886    cat conftest.err >&5
  6.1887 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1888 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1889    (exit $ac_status); } && {
  6.1890  	 test -z "$ac_c_werror_flag" ||
  6.1891  	 test ! -s conftest.err
  6.1892         } && test -s conftest.$ac_objext; then
  6.1893    ac_cv_prog_cc_g=yes
  6.1894  else
  6.1895 -  echo "$as_me: failed program was:" >&5
  6.1896 +  $as_echo "$as_me: failed program was:" >&5
  6.1897  sed 's/^/| /' conftest.$ac_ext >&5
  6.1898  
  6.1899  	CFLAGS=""
  6.1900 @@ -2854,20 +2989,21 @@
  6.1901    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1902    *) ac_try_echo=$ac_try;;
  6.1903  esac
  6.1904 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1905 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1906 +$as_echo "$ac_try_echo") >&5
  6.1907    (eval "$ac_compile") 2>conftest.er1
  6.1908    ac_status=$?
  6.1909    grep -v '^ *+' conftest.er1 >conftest.err
  6.1910    rm -f conftest.er1
  6.1911    cat conftest.err >&5
  6.1912 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1913 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1914    (exit $ac_status); } && {
  6.1915  	 test -z "$ac_c_werror_flag" ||
  6.1916  	 test ! -s conftest.err
  6.1917         } && test -s conftest.$ac_objext; then
  6.1918    :
  6.1919  else
  6.1920 -  echo "$as_me: failed program was:" >&5
  6.1921 +  $as_echo "$as_me: failed program was:" >&5
  6.1922  sed 's/^/| /' conftest.$ac_ext >&5
  6.1923  
  6.1924  	ac_c_werror_flag=$ac_save_c_werror_flag
  6.1925 @@ -2893,20 +3029,21 @@
  6.1926    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1927    *) ac_try_echo=$ac_try;;
  6.1928  esac
  6.1929 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1930 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1931 +$as_echo "$ac_try_echo") >&5
  6.1932    (eval "$ac_compile") 2>conftest.er1
  6.1933    ac_status=$?
  6.1934    grep -v '^ *+' conftest.er1 >conftest.err
  6.1935    rm -f conftest.er1
  6.1936    cat conftest.err >&5
  6.1937 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1938 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1939    (exit $ac_status); } && {
  6.1940  	 test -z "$ac_c_werror_flag" ||
  6.1941  	 test ! -s conftest.err
  6.1942         } && test -s conftest.$ac_objext; then
  6.1943    ac_cv_prog_cc_g=yes
  6.1944  else
  6.1945 -  echo "$as_me: failed program was:" >&5
  6.1946 +  $as_echo "$as_me: failed program was:" >&5
  6.1947  sed 's/^/| /' conftest.$ac_ext >&5
  6.1948  
  6.1949  
  6.1950 @@ -2921,8 +3058,8 @@
  6.1951  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  6.1952     ac_c_werror_flag=$ac_save_c_werror_flag
  6.1953  fi
  6.1954 -{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  6.1955 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
  6.1956 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  6.1957 +$as_echo "$ac_cv_prog_cc_g" >&6; }
  6.1958  if test "$ac_test_CFLAGS" = set; then
  6.1959    CFLAGS=$ac_save_CFLAGS
  6.1960  elif test $ac_cv_prog_cc_g = yes; then
  6.1961 @@ -2938,10 +3075,10 @@
  6.1962      CFLAGS=
  6.1963    fi
  6.1964  fi
  6.1965 -{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
  6.1966 -echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
  6.1967 +{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
  6.1968 +$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
  6.1969  if test "${ac_cv_prog_cc_c89+set}" = set; then
  6.1970 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.1971 +  $as_echo_n "(cached) " >&6
  6.1972  else
  6.1973    ac_cv_prog_cc_c89=no
  6.1974  ac_save_CC=$CC
  6.1975 @@ -3012,20 +3149,21 @@
  6.1976    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.1977    *) ac_try_echo=$ac_try;;
  6.1978  esac
  6.1979 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.1980 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.1981 +$as_echo "$ac_try_echo") >&5
  6.1982    (eval "$ac_compile") 2>conftest.er1
  6.1983    ac_status=$?
  6.1984    grep -v '^ *+' conftest.er1 >conftest.err
  6.1985    rm -f conftest.er1
  6.1986    cat conftest.err >&5
  6.1987 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1988 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.1989    (exit $ac_status); } && {
  6.1990  	 test -z "$ac_c_werror_flag" ||
  6.1991  	 test ! -s conftest.err
  6.1992         } && test -s conftest.$ac_objext; then
  6.1993    ac_cv_prog_cc_c89=$ac_arg
  6.1994  else
  6.1995 -  echo "$as_me: failed program was:" >&5
  6.1996 +  $as_echo "$as_me: failed program was:" >&5
  6.1997  sed 's/^/| /' conftest.$ac_ext >&5
  6.1998  
  6.1999  
  6.2000 @@ -3041,15 +3179,15 @@
  6.2001  # AC_CACHE_VAL
  6.2002  case "x$ac_cv_prog_cc_c89" in
  6.2003    x)
  6.2004 -    { echo "$as_me:$LINENO: result: none needed" >&5
  6.2005 -echo "${ECHO_T}none needed" >&6; } ;;
  6.2006 +    { $as_echo "$as_me:$LINENO: result: none needed" >&5
  6.2007 +$as_echo "none needed" >&6; } ;;
  6.2008    xno)
  6.2009 -    { echo "$as_me:$LINENO: result: unsupported" >&5
  6.2010 -echo "${ECHO_T}unsupported" >&6; } ;;
  6.2011 +    { $as_echo "$as_me:$LINENO: result: unsupported" >&5
  6.2012 +$as_echo "unsupported" >&6; } ;;
  6.2013    *)
  6.2014      CC="$CC $ac_cv_prog_cc_c89"
  6.2015 -    { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
  6.2016 -echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
  6.2017 +    { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
  6.2018 +$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
  6.2019  esac
  6.2020  
  6.2021  
  6.2022 @@ -3059,48 +3197,43 @@
  6.2023  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  6.2024  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  6.2025  
  6.2026 -{ echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
  6.2027 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6; }
  6.2028 +{ $as_echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
  6.2029 +$as_echo_n "checking for a sed that does not truncate output... " >&6; }
  6.2030  if test "${ac_cv_path_SED+set}" = set; then
  6.2031 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2032 +  $as_echo_n "(cached) " >&6
  6.2033  else
  6.2034              ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
  6.2035       for ac_i in 1 2 3 4 5 6 7; do
  6.2036         ac_script="$ac_script$as_nl$ac_script"
  6.2037       done
  6.2038 -     echo "$ac_script" | sed 99q >conftest.sed
  6.2039 +     echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed
  6.2040       $as_unset ac_script || ac_script=
  6.2041 -     # Extract the first word of "sed gsed" to use in msg output
  6.2042 -if test -z "$SED"; then
  6.2043 -set dummy sed gsed; ac_prog_name=$2
  6.2044 -if test "${ac_cv_path_SED+set}" = set; then
  6.2045 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2046 -else
  6.2047 +     if test -z "$SED"; then
  6.2048    ac_path_SED_found=false
  6.2049 -# Loop through the user's path and test for each of PROGNAME-LIST
  6.2050 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2051 +  # Loop through the user's path and test for each of PROGNAME-LIST
  6.2052 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2053  for as_dir in $PATH
  6.2054  do
  6.2055    IFS=$as_save_IFS
  6.2056    test -z "$as_dir" && as_dir=.
  6.2057    for ac_prog in sed gsed; do
  6.2058 -  for ac_exec_ext in '' $ac_executable_extensions; do
  6.2059 -    ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
  6.2060 -    { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
  6.2061 -    # Check for GNU ac_path_SED and select it if it is found.
  6.2062 +    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2063 +      ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
  6.2064 +      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
  6.2065 +# Check for GNU ac_path_SED and select it if it is found.
  6.2066    # Check for GNU $ac_path_SED
  6.2067  case `"$ac_path_SED" --version 2>&1` in
  6.2068  *GNU*)
  6.2069    ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;;
  6.2070  *)
  6.2071    ac_count=0
  6.2072 -  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
  6.2073 +  $as_echo_n 0123456789 >"conftest.in"
  6.2074    while :
  6.2075    do
  6.2076      cat "conftest.in" "conftest.in" >"conftest.tmp"
  6.2077      mv "conftest.tmp" "conftest.in"
  6.2078      cp "conftest.in" "conftest.nl"
  6.2079 -    echo '' >> "conftest.nl"
  6.2080 +    $as_echo '' >> "conftest.nl"
  6.2081      "$ac_path_SED" -f conftest.sed < "conftest.nl" >"conftest.out" 2>/dev/null || break
  6.2082      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  6.2083      ac_count=`expr $ac_count + 1`
  6.2084 @@ -3115,31 +3248,23 @@
  6.2085    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  6.2086  esac
  6.2087  
  6.2088 -
  6.2089 -    $ac_path_SED_found && break 3
  6.2090 +      $ac_path_SED_found && break 3
  6.2091 +    done
  6.2092    done
  6.2093  done
  6.2094 -
  6.2095 -done
  6.2096 -IFS=$as_save_IFS
  6.2097 -
  6.2098 -
  6.2099 -fi
  6.2100 -
  6.2101 -SED="$ac_cv_path_SED"
  6.2102 -if test -z "$SED"; then
  6.2103 -  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in \$PATH" >&5
  6.2104 -echo "$as_me: error: no acceptable $ac_prog_name could be found in \$PATH" >&2;}
  6.2105 +IFS=$as_save_IFS
  6.2106 +  if test -z "$ac_cv_path_SED"; then
  6.2107 +    { { $as_echo "$as_me:$LINENO: error: no acceptable sed could be found in \$PATH" >&5
  6.2108 +$as_echo "$as_me: error: no acceptable sed could be found in \$PATH" >&2;}
  6.2109     { (exit 1); exit 1; }; }
  6.2110 -fi
  6.2111 -
  6.2112 +  fi
  6.2113  else
  6.2114    ac_cv_path_SED=$SED
  6.2115  fi
  6.2116  
  6.2117  fi
  6.2118 -{ echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
  6.2119 -echo "${ECHO_T}$ac_cv_path_SED" >&6; }
  6.2120 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_SED" >&5
  6.2121 +$as_echo "$ac_cv_path_SED" >&6; }
  6.2122   SED="$ac_cv_path_SED"
  6.2123    rm -f conftest.sed
  6.2124  
  6.2125 @@ -3156,42 +3281,37 @@
  6.2126  
  6.2127  
  6.2128  
  6.2129 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
  6.2130 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
  6.2131 +{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
  6.2132 +$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
  6.2133  if test "${ac_cv_path_GREP+set}" = set; then
  6.2134 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2135 -else
  6.2136 -  # Extract the first word of "grep ggrep" to use in msg output
  6.2137 -if test -z "$GREP"; then
  6.2138 -set dummy grep ggrep; ac_prog_name=$2
  6.2139 -if test "${ac_cv_path_GREP+set}" = set; then
  6.2140 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2141 -else
  6.2142 +  $as_echo_n "(cached) " >&6
  6.2143 +else
  6.2144 +  if test -z "$GREP"; then
  6.2145    ac_path_GREP_found=false
  6.2146 -# Loop through the user's path and test for each of PROGNAME-LIST
  6.2147 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2148 +  # Loop through the user's path and test for each of PROGNAME-LIST
  6.2149 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2150  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  6.2151  do
  6.2152    IFS=$as_save_IFS
  6.2153    test -z "$as_dir" && as_dir=.
  6.2154    for ac_prog in grep ggrep; do
  6.2155 -  for ac_exec_ext in '' $ac_executable_extensions; do
  6.2156 -    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2157 -    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  6.2158 -    # Check for GNU ac_path_GREP and select it if it is found.
  6.2159 +    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2160 +      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2161 +      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
  6.2162 +# Check for GNU ac_path_GREP and select it if it is found.
  6.2163    # Check for GNU $ac_path_GREP
  6.2164  case `"$ac_path_GREP" --version 2>&1` in
  6.2165  *GNU*)
  6.2166    ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
  6.2167  *)
  6.2168    ac_count=0
  6.2169 -  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
  6.2170 +  $as_echo_n 0123456789 >"conftest.in"
  6.2171    while :
  6.2172    do
  6.2173      cat "conftest.in" "conftest.in" >"conftest.tmp"
  6.2174      mv "conftest.tmp" "conftest.in"
  6.2175      cp "conftest.in" "conftest.nl"
  6.2176 -    echo 'GREP' >> "conftest.nl"
  6.2177 +    $as_echo 'GREP' >> "conftest.nl"
  6.2178      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  6.2179      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  6.2180      ac_count=`expr $ac_count + 1`
  6.2181 @@ -3206,74 +3326,60 @@
  6.2182    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  6.2183  esac
  6.2184  
  6.2185 -
  6.2186 -    $ac_path_GREP_found && break 3
  6.2187 +      $ac_path_GREP_found && break 3
  6.2188 +    done
  6.2189    done
  6.2190  done
  6.2191 -
  6.2192 -done
  6.2193 -IFS=$as_save_IFS
  6.2194 -
  6.2195 -
  6.2196 -fi
  6.2197 -
  6.2198 -GREP="$ac_cv_path_GREP"
  6.2199 -if test -z "$GREP"; then
  6.2200 -  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2201 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2202 +IFS=$as_save_IFS
  6.2203 +  if test -z "$ac_cv_path_GREP"; then
  6.2204 +    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2205 +$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2206     { (exit 1); exit 1; }; }
  6.2207 -fi
  6.2208 -
  6.2209 +  fi
  6.2210  else
  6.2211    ac_cv_path_GREP=$GREP
  6.2212  fi
  6.2213  
  6.2214 -
  6.2215 -fi
  6.2216 -{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
  6.2217 -echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
  6.2218 +fi
  6.2219 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
  6.2220 +$as_echo "$ac_cv_path_GREP" >&6; }
  6.2221   GREP="$ac_cv_path_GREP"
  6.2222  
  6.2223  
  6.2224 -{ echo "$as_me:$LINENO: checking for egrep" >&5
  6.2225 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
  6.2226 +{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
  6.2227 +$as_echo_n "checking for egrep... " >&6; }
  6.2228  if test "${ac_cv_path_EGREP+set}" = set; then
  6.2229 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2230 +  $as_echo_n "(cached) " >&6
  6.2231  else
  6.2232    if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
  6.2233     then ac_cv_path_EGREP="$GREP -E"
  6.2234     else
  6.2235 -     # Extract the first word of "egrep" to use in msg output
  6.2236 -if test -z "$EGREP"; then
  6.2237 -set dummy egrep; ac_prog_name=$2
  6.2238 -if test "${ac_cv_path_EGREP+set}" = set; then
  6.2239 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2240 -else
  6.2241 +     if test -z "$EGREP"; then
  6.2242    ac_path_EGREP_found=false
  6.2243 -# Loop through the user's path and test for each of PROGNAME-LIST
  6.2244 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2245 +  # Loop through the user's path and test for each of PROGNAME-LIST
  6.2246 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2247  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  6.2248  do
  6.2249    IFS=$as_save_IFS
  6.2250    test -z "$as_dir" && as_dir=.
  6.2251    for ac_prog in egrep; do
  6.2252 -  for ac_exec_ext in '' $ac_executable_extensions; do
  6.2253 -    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2254 -    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  6.2255 -    # Check for GNU ac_path_EGREP and select it if it is found.
  6.2256 +    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2257 +      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2258 +      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
  6.2259 +# Check for GNU ac_path_EGREP and select it if it is found.
  6.2260    # Check for GNU $ac_path_EGREP
  6.2261  case `"$ac_path_EGREP" --version 2>&1` in
  6.2262  *GNU*)
  6.2263    ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
  6.2264  *)
  6.2265    ac_count=0
  6.2266 -  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
  6.2267 +  $as_echo_n 0123456789 >"conftest.in"
  6.2268    while :
  6.2269    do
  6.2270      cat "conftest.in" "conftest.in" >"conftest.tmp"
  6.2271      mv "conftest.tmp" "conftest.in"
  6.2272      cp "conftest.in" "conftest.nl"
  6.2273 -    echo 'EGREP' >> "conftest.nl"
  6.2274 +    $as_echo 'EGREP' >> "conftest.nl"
  6.2275      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
  6.2276      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  6.2277      ac_count=`expr $ac_count + 1`
  6.2278 @@ -3288,75 +3394,61 @@
  6.2279    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  6.2280  esac
  6.2281  
  6.2282 -
  6.2283 -    $ac_path_EGREP_found && break 3
  6.2284 +      $ac_path_EGREP_found && break 3
  6.2285 +    done
  6.2286    done
  6.2287  done
  6.2288 -
  6.2289 -done
  6.2290 -IFS=$as_save_IFS
  6.2291 -
  6.2292 -
  6.2293 -fi
  6.2294 -
  6.2295 -EGREP="$ac_cv_path_EGREP"
  6.2296 -if test -z "$EGREP"; then
  6.2297 -  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2298 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2299 +IFS=$as_save_IFS
  6.2300 +  if test -z "$ac_cv_path_EGREP"; then
  6.2301 +    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2302 +$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2303     { (exit 1); exit 1; }; }
  6.2304 -fi
  6.2305 -
  6.2306 +  fi
  6.2307  else
  6.2308    ac_cv_path_EGREP=$EGREP
  6.2309  fi
  6.2310  
  6.2311 -
  6.2312     fi
  6.2313  fi
  6.2314 -{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
  6.2315 -echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
  6.2316 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
  6.2317 +$as_echo "$ac_cv_path_EGREP" >&6; }
  6.2318   EGREP="$ac_cv_path_EGREP"
  6.2319  
  6.2320  
  6.2321 -{ echo "$as_me:$LINENO: checking for fgrep" >&5
  6.2322 -echo $ECHO_N "checking for fgrep... $ECHO_C" >&6; }
  6.2323 +{ $as_echo "$as_me:$LINENO: checking for fgrep" >&5
  6.2324 +$as_echo_n "checking for fgrep... " >&6; }
  6.2325  if test "${ac_cv_path_FGREP+set}" = set; then
  6.2326 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2327 +  $as_echo_n "(cached) " >&6
  6.2328  else
  6.2329    if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
  6.2330     then ac_cv_path_FGREP="$GREP -F"
  6.2331     else
  6.2332 -     # Extract the first word of "fgrep" to use in msg output
  6.2333 -if test -z "$FGREP"; then
  6.2334 -set dummy fgrep; ac_prog_name=$2
  6.2335 -if test "${ac_cv_path_FGREP+set}" = set; then
  6.2336 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2337 -else
  6.2338 +     if test -z "$FGREP"; then
  6.2339    ac_path_FGREP_found=false
  6.2340 -# Loop through the user's path and test for each of PROGNAME-LIST
  6.2341 -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2342 +  # Loop through the user's path and test for each of PROGNAME-LIST
  6.2343 +  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  6.2344  for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
  6.2345  do
  6.2346    IFS=$as_save_IFS
  6.2347    test -z "$as_dir" && as_dir=.
  6.2348    for ac_prog in fgrep; do
  6.2349 -  for ac_exec_ext in '' $ac_executable_extensions; do
  6.2350 -    ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2351 -    { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  6.2352 -    # Check for GNU ac_path_FGREP and select it if it is found.
  6.2353 +    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2354 +      ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
  6.2355 +      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
  6.2356 +# Check for GNU ac_path_FGREP and select it if it is found.
  6.2357    # Check for GNU $ac_path_FGREP
  6.2358  case `"$ac_path_FGREP" --version 2>&1` in
  6.2359  *GNU*)
  6.2360    ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;;
  6.2361  *)
  6.2362    ac_count=0
  6.2363 -  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
  6.2364 +  $as_echo_n 0123456789 >"conftest.in"
  6.2365    while :
  6.2366    do
  6.2367      cat "conftest.in" "conftest.in" >"conftest.tmp"
  6.2368      mv "conftest.tmp" "conftest.in"
  6.2369      cp "conftest.in" "conftest.nl"
  6.2370 -    echo 'FGREP' >> "conftest.nl"
  6.2371 +    $as_echo 'FGREP' >> "conftest.nl"
  6.2372      "$ac_path_FGREP" FGREP < "conftest.nl" >"conftest.out" 2>/dev/null || break
  6.2373      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
  6.2374      ac_count=`expr $ac_count + 1`
  6.2375 @@ -3371,33 +3463,24 @@
  6.2376    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  6.2377  esac
  6.2378  
  6.2379 -
  6.2380 -    $ac_path_FGREP_found && break 3
  6.2381 +      $ac_path_FGREP_found && break 3
  6.2382 +    done
  6.2383    done
  6.2384  done
  6.2385 -
  6.2386 -done
  6.2387 -IFS=$as_save_IFS
  6.2388 -
  6.2389 -
  6.2390 -fi
  6.2391 -
  6.2392 -FGREP="$ac_cv_path_FGREP"
  6.2393 -if test -z "$FGREP"; then
  6.2394 -  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2395 -echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2396 +IFS=$as_save_IFS
  6.2397 +  if test -z "$ac_cv_path_FGREP"; then
  6.2398 +    { { $as_echo "$as_me:$LINENO: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
  6.2399 +$as_echo "$as_me: error: no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
  6.2400     { (exit 1); exit 1; }; }
  6.2401 -fi
  6.2402 -
  6.2403 +  fi
  6.2404  else
  6.2405    ac_cv_path_FGREP=$FGREP
  6.2406  fi
  6.2407  
  6.2408 -
  6.2409     fi
  6.2410  fi
  6.2411 -{ echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
  6.2412 -echo "${ECHO_T}$ac_cv_path_FGREP" >&6; }
  6.2413 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_FGREP" >&5
  6.2414 +$as_echo "$ac_cv_path_FGREP" >&6; }
  6.2415   FGREP="$ac_cv_path_FGREP"
  6.2416  
  6.2417  
  6.2418 @@ -3431,8 +3514,8 @@
  6.2419  ac_prog=ld
  6.2420  if test "$GCC" = yes; then
  6.2421    # Check if gcc -print-prog-name=ld gives a path.
  6.2422 -  { echo "$as_me:$LINENO: checking for ld used by $CC" >&5
  6.2423 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6; }
  6.2424 +  { $as_echo "$as_me:$LINENO: checking for ld used by $CC" >&5
  6.2425 +$as_echo_n "checking for ld used by $CC... " >&6; }
  6.2426    case $host in
  6.2427    *-*-mingw*)
  6.2428      # gcc leaves a trailing carriage return which upsets mingw
  6.2429 @@ -3461,14 +3544,14 @@
  6.2430      ;;
  6.2431    esac
  6.2432  elif test "$with_gnu_ld" = yes; then
  6.2433 -  { echo "$as_me:$LINENO: checking for GNU ld" >&5
  6.2434 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6; }
  6.2435 -else
  6.2436 -  { echo "$as_me:$LINENO: checking for non-GNU ld" >&5
  6.2437 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6; }
  6.2438 +  { $as_echo "$as_me:$LINENO: checking for GNU ld" >&5
  6.2439 +$as_echo_n "checking for GNU ld... " >&6; }
  6.2440 +else
  6.2441 +  { $as_echo "$as_me:$LINENO: checking for non-GNU ld" >&5
  6.2442 +$as_echo_n "checking for non-GNU ld... " >&6; }
  6.2443  fi
  6.2444  if test "${lt_cv_path_LD+set}" = set; then
  6.2445 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2446 +  $as_echo_n "(cached) " >&6
  6.2447  else
  6.2448    if test -z "$LD"; then
  6.2449    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
  6.2450 @@ -3498,19 +3581,19 @@
  6.2451  
  6.2452  LD="$lt_cv_path_LD"
  6.2453  if test -n "$LD"; then
  6.2454 -  { echo "$as_me:$LINENO: result: $LD" >&5
  6.2455 -echo "${ECHO_T}$LD" >&6; }
  6.2456 -else
  6.2457 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2458 -echo "${ECHO_T}no" >&6; }
  6.2459 -fi
  6.2460 -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  6.2461 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
  6.2462 +  { $as_echo "$as_me:$LINENO: result: $LD" >&5
  6.2463 +$as_echo "$LD" >&6; }
  6.2464 +else
  6.2465 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2466 +$as_echo "no" >&6; }
  6.2467 +fi
  6.2468 +test -z "$LD" && { { $as_echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
  6.2469 +$as_echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
  6.2470     { (exit 1); exit 1; }; }
  6.2471 -{ echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
  6.2472 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6; }
  6.2473 +{ $as_echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
  6.2474 +$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
  6.2475  if test "${lt_cv_prog_gnu_ld+set}" = set; then
  6.2476 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2477 +  $as_echo_n "(cached) " >&6
  6.2478  else
  6.2479    # I'd rather use --version here, but apparently some GNU lds only accept -v.
  6.2480  case `$LD -v 2>&1 </dev/null` in
  6.2481 @@ -3522,8 +3605,8 @@
  6.2482    ;;
  6.2483  esac
  6.2484  fi
  6.2485 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
  6.2486 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6; }
  6.2487 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
  6.2488 +$as_echo "$lt_cv_prog_gnu_ld" >&6; }
  6.2489  with_gnu_ld=$lt_cv_prog_gnu_ld
  6.2490  
  6.2491  
  6.2492 @@ -3534,10 +3617,10 @@
  6.2493  
  6.2494  
  6.2495  
  6.2496 -{ echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
  6.2497 -echo $ECHO_N "checking for BSD- or MS-compatible name lister (nm)... $ECHO_C" >&6; }
  6.2498 +{ $as_echo "$as_me:$LINENO: checking for BSD- or MS-compatible name lister (nm)" >&5
  6.2499 +$as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
  6.2500  if test "${lt_cv_path_NM+set}" = set; then
  6.2501 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2502 +  $as_echo_n "(cached) " >&6
  6.2503  else
  6.2504    if test -n "$NM"; then
  6.2505    # Let the user override the test.
  6.2506 @@ -3583,8 +3666,8 @@
  6.2507    : ${lt_cv_path_NM=no}
  6.2508  fi
  6.2509  fi
  6.2510 -{ echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
  6.2511 -echo "${ECHO_T}$lt_cv_path_NM" >&6; }
  6.2512 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
  6.2513 +$as_echo "$lt_cv_path_NM" >&6; }
  6.2514  if test "$lt_cv_path_NM" != "no"; then
  6.2515    NM="$lt_cv_path_NM"
  6.2516  else
  6.2517 @@ -3594,10 +3677,10 @@
  6.2518    do
  6.2519      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  6.2520  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
  6.2521 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2522 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2523 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2524 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2525  if test "${ac_cv_prog_DUMPBIN+set}" = set; then
  6.2526 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2527 +  $as_echo_n "(cached) " >&6
  6.2528  else
  6.2529    if test -n "$DUMPBIN"; then
  6.2530    ac_cv_prog_DUMPBIN="$DUMPBIN" # Let the user override the test.
  6.2531 @@ -3610,7 +3693,7 @@
  6.2532    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2533    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2534      ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
  6.2535 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2536 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2537      break 2
  6.2538    fi
  6.2539  done
  6.2540 @@ -3621,11 +3704,11 @@
  6.2541  fi
  6.2542  DUMPBIN=$ac_cv_prog_DUMPBIN
  6.2543  if test -n "$DUMPBIN"; then
  6.2544 -  { echo "$as_me:$LINENO: result: $DUMPBIN" >&5
  6.2545 -echo "${ECHO_T}$DUMPBIN" >&6; }
  6.2546 -else
  6.2547 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2548 -echo "${ECHO_T}no" >&6; }
  6.2549 +  { $as_echo "$as_me:$LINENO: result: $DUMPBIN" >&5
  6.2550 +$as_echo "$DUMPBIN" >&6; }
  6.2551 +else
  6.2552 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2553 +$as_echo "no" >&6; }
  6.2554  fi
  6.2555  
  6.2556  
  6.2557 @@ -3638,10 +3721,10 @@
  6.2558  do
  6.2559    # Extract the first word of "$ac_prog", so it can be a program name with args.
  6.2560  set dummy $ac_prog; ac_word=$2
  6.2561 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2562 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2563 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2564 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2565  if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then
  6.2566 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2567 +  $as_echo_n "(cached) " >&6
  6.2568  else
  6.2569    if test -n "$ac_ct_DUMPBIN"; then
  6.2570    ac_cv_prog_ac_ct_DUMPBIN="$ac_ct_DUMPBIN" # Let the user override the test.
  6.2571 @@ -3654,7 +3737,7 @@
  6.2572    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2573    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2574      ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
  6.2575 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2576 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2577      break 2
  6.2578    fi
  6.2579  done
  6.2580 @@ -3665,11 +3748,11 @@
  6.2581  fi
  6.2582  ac_ct_DUMPBIN=$ac_cv_prog_ac_ct_DUMPBIN
  6.2583  if test -n "$ac_ct_DUMPBIN"; then
  6.2584 -  { echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
  6.2585 -echo "${ECHO_T}$ac_ct_DUMPBIN" >&6; }
  6.2586 -else
  6.2587 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2588 -echo "${ECHO_T}no" >&6; }
  6.2589 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_DUMPBIN" >&5
  6.2590 +$as_echo "$ac_ct_DUMPBIN" >&6; }
  6.2591 +else
  6.2592 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2593 +$as_echo "no" >&6; }
  6.2594  fi
  6.2595  
  6.2596  
  6.2597 @@ -3681,12 +3764,8 @@
  6.2598    else
  6.2599      case $cross_compiling:$ac_tool_warned in
  6.2600  yes:)
  6.2601 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.2602 -whose name does not start with the host triplet.  If you think this
  6.2603 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.2604 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.2605 -whose name does not start with the host triplet.  If you think this
  6.2606 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.2607 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.2608 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.2609  ac_tool_warned=yes ;;
  6.2610  esac
  6.2611      DUMPBIN=$ac_ct_DUMPBIN
  6.2612 @@ -3705,45 +3784,45 @@
  6.2613  
  6.2614  
  6.2615  
  6.2616 -{ echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
  6.2617 -echo $ECHO_N "checking the name lister ($NM) interface... $ECHO_C" >&6; }
  6.2618 +{ $as_echo "$as_me:$LINENO: checking the name lister ($NM) interface" >&5
  6.2619 +$as_echo_n "checking the name lister ($NM) interface... " >&6; }
  6.2620  if test "${lt_cv_nm_interface+set}" = set; then
  6.2621 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2622 +  $as_echo_n "(cached) " >&6
  6.2623  else
  6.2624    lt_cv_nm_interface="BSD nm"
  6.2625    echo "int some_variable = 0;" > conftest.$ac_ext
  6.2626 -  (eval echo "\"\$as_me:3715: $ac_compile\"" >&5)
  6.2627 +  (eval echo "\"\$as_me:3794: $ac_compile\"" >&5)
  6.2628    (eval "$ac_compile" 2>conftest.err)
  6.2629    cat conftest.err >&5
  6.2630 -  (eval echo "\"\$as_me:3718: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  6.2631 +  (eval echo "\"\$as_me:3797: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
  6.2632    (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
  6.2633    cat conftest.err >&5
  6.2634 -  (eval echo "\"\$as_me:3721: output\"" >&5)
  6.2635 +  (eval echo "\"\$as_me:3800: output\"" >&5)
  6.2636    cat conftest.out >&5
  6.2637    if $GREP 'External.*some_variable' conftest.out > /dev/null; then
  6.2638      lt_cv_nm_interface="MS dumpbin"
  6.2639    fi
  6.2640    rm -f conftest*
  6.2641  fi
  6.2642 -{ echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
  6.2643 -echo "${ECHO_T}$lt_cv_nm_interface" >&6; }
  6.2644 -
  6.2645 -{ echo "$as_me:$LINENO: checking whether ln -s works" >&5
  6.2646 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
  6.2647 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_nm_interface" >&5
  6.2648 +$as_echo "$lt_cv_nm_interface" >&6; }
  6.2649 +
  6.2650 +{ $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
  6.2651 +$as_echo_n "checking whether ln -s works... " >&6; }
  6.2652  LN_S=$as_ln_s
  6.2653  if test "$LN_S" = "ln -s"; then
  6.2654 -  { echo "$as_me:$LINENO: result: yes" >&5
  6.2655 -echo "${ECHO_T}yes" >&6; }
  6.2656 -else
  6.2657 -  { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
  6.2658 -echo "${ECHO_T}no, using $LN_S" >&6; }
  6.2659 +  { $as_echo "$as_me:$LINENO: result: yes" >&5
  6.2660 +$as_echo "yes" >&6; }
  6.2661 +else
  6.2662 +  { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
  6.2663 +$as_echo "no, using $LN_S" >&6; }
  6.2664  fi
  6.2665  
  6.2666  # find the maximum length of command line arguments
  6.2667 -{ echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
  6.2668 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6; }
  6.2669 +{ $as_echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
  6.2670 +$as_echo_n "checking the maximum length of command line arguments... " >&6; }
  6.2671  if test "${lt_cv_sys_max_cmd_len+set}" = set; then
  6.2672 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2673 +  $as_echo_n "(cached) " >&6
  6.2674  else
  6.2675      i=0
  6.2676    teststring="ABCD"
  6.2677 @@ -3866,11 +3945,11 @@
  6.2678  fi
  6.2679  
  6.2680  if test -n $lt_cv_sys_max_cmd_len ; then
  6.2681 -  { echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
  6.2682 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6; }
  6.2683 -else
  6.2684 -  { echo "$as_me:$LINENO: result: none" >&5
  6.2685 -echo "${ECHO_T}none" >&6; }
  6.2686 +  { $as_echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
  6.2687 +$as_echo "$lt_cv_sys_max_cmd_len" >&6; }
  6.2688 +else
  6.2689 +  { $as_echo "$as_me:$LINENO: result: none" >&5
  6.2690 +$as_echo "none" >&6; }
  6.2691  fi
  6.2692  max_cmd_len=$lt_cv_sys_max_cmd_len
  6.2693  
  6.2694 @@ -3883,8 +3962,8 @@
  6.2695  : ${MV="mv -f"}
  6.2696  : ${RM="rm -f"}
  6.2697  
  6.2698 -{ echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
  6.2699 -echo $ECHO_N "checking whether the shell understands some XSI constructs... $ECHO_C" >&6; }
  6.2700 +{ $as_echo "$as_me:$LINENO: checking whether the shell understands some XSI constructs" >&5
  6.2701 +$as_echo_n "checking whether the shell understands some XSI constructs... " >&6; }
  6.2702  # Try some XSI features
  6.2703  xsi_shell=no
  6.2704  ( _lt_dummy="a/b/c"
  6.2705 @@ -3893,18 +3972,18 @@
  6.2706      && eval 'test $(( 1 + 1 )) -eq 2 \
  6.2707      && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
  6.2708    && xsi_shell=yes
  6.2709 -{ echo "$as_me:$LINENO: result: $xsi_shell" >&5
  6.2710 -echo "${ECHO_T}$xsi_shell" >&6; }
  6.2711 -
  6.2712 -
  6.2713 -{ echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
  6.2714 -echo $ECHO_N "checking whether the shell understands \"+=\"... $ECHO_C" >&6; }
  6.2715 +{ $as_echo "$as_me:$LINENO: result: $xsi_shell" >&5
  6.2716 +$as_echo "$xsi_shell" >&6; }
  6.2717 +
  6.2718 +
  6.2719 +{ $as_echo "$as_me:$LINENO: checking whether the shell understands \"+=\"" >&5
  6.2720 +$as_echo_n "checking whether the shell understands \"+=\"... " >&6; }
  6.2721  lt_shell_append=no
  6.2722  ( foo=bar; set foo baz; eval "$1+=\$2" && test "$foo" = barbaz ) \
  6.2723      >/dev/null 2>&1 \
  6.2724    && lt_shell_append=yes
  6.2725 -{ echo "$as_me:$LINENO: result: $lt_shell_append" >&5
  6.2726 -echo "${ECHO_T}$lt_shell_append" >&6; }
  6.2727 +{ $as_echo "$as_me:$LINENO: result: $lt_shell_append" >&5
  6.2728 +$as_echo "$lt_shell_append" >&6; }
  6.2729  
  6.2730  
  6.2731  if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
  6.2732 @@ -3938,15 +4017,15 @@
  6.2733  
  6.2734  
  6.2735  
  6.2736 -{ echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
  6.2737 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6; }
  6.2738 +{ $as_echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
  6.2739 +$as_echo_n "checking for $LD option to reload object files... " >&6; }
  6.2740  if test "${lt_cv_ld_reload_flag+set}" = set; then
  6.2741 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2742 +  $as_echo_n "(cached) " >&6
  6.2743  else
  6.2744    lt_cv_ld_reload_flag='-r'
  6.2745  fi
  6.2746 -{ echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
  6.2747 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6; }
  6.2748 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
  6.2749 +$as_echo "$lt_cv_ld_reload_flag" >&6; }
  6.2750  reload_flag=$lt_cv_ld_reload_flag
  6.2751  case $reload_flag in
  6.2752  "" | " "*) ;;
  6.2753 @@ -3974,10 +4053,10 @@
  6.2754  if test -n "$ac_tool_prefix"; then
  6.2755    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  6.2756  set dummy ${ac_tool_prefix}objdump; ac_word=$2
  6.2757 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2758 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2759 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2760 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2761  if test "${ac_cv_prog_OBJDUMP+set}" = set; then
  6.2762 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2763 +  $as_echo_n "(cached) " >&6
  6.2764  else
  6.2765    if test -n "$OBJDUMP"; then
  6.2766    ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
  6.2767 @@ -3990,7 +4069,7 @@
  6.2768    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2769    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2770      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  6.2771 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2772 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2773      break 2
  6.2774    fi
  6.2775  done
  6.2776 @@ -4001,11 +4080,11 @@
  6.2777  fi
  6.2778  OBJDUMP=$ac_cv_prog_OBJDUMP
  6.2779  if test -n "$OBJDUMP"; then
  6.2780 -  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  6.2781 -echo "${ECHO_T}$OBJDUMP" >&6; }
  6.2782 -else
  6.2783 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2784 -echo "${ECHO_T}no" >&6; }
  6.2785 +  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  6.2786 +$as_echo "$OBJDUMP" >&6; }
  6.2787 +else
  6.2788 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2789 +$as_echo "no" >&6; }
  6.2790  fi
  6.2791  
  6.2792  
  6.2793 @@ -4014,10 +4093,10 @@
  6.2794    ac_ct_OBJDUMP=$OBJDUMP
  6.2795    # Extract the first word of "objdump", so it can be a program name with args.
  6.2796  set dummy objdump; ac_word=$2
  6.2797 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2798 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2799 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2800 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2801  if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
  6.2802 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2803 +  $as_echo_n "(cached) " >&6
  6.2804  else
  6.2805    if test -n "$ac_ct_OBJDUMP"; then
  6.2806    ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
  6.2807 @@ -4030,7 +4109,7 @@
  6.2808    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2809    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2810      ac_cv_prog_ac_ct_OBJDUMP="objdump"
  6.2811 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2812 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2813      break 2
  6.2814    fi
  6.2815  done
  6.2816 @@ -4041,11 +4120,11 @@
  6.2817  fi
  6.2818  ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
  6.2819  if test -n "$ac_ct_OBJDUMP"; then
  6.2820 -  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  6.2821 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
  6.2822 -else
  6.2823 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2824 -echo "${ECHO_T}no" >&6; }
  6.2825 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  6.2826 +$as_echo "$ac_ct_OBJDUMP" >&6; }
  6.2827 +else
  6.2828 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2829 +$as_echo "no" >&6; }
  6.2830  fi
  6.2831  
  6.2832    if test "x$ac_ct_OBJDUMP" = x; then
  6.2833 @@ -4053,12 +4132,8 @@
  6.2834    else
  6.2835      case $cross_compiling:$ac_tool_warned in
  6.2836  yes:)
  6.2837 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.2838 -whose name does not start with the host triplet.  If you think this
  6.2839 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.2840 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.2841 -whose name does not start with the host triplet.  If you think this
  6.2842 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.2843 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.2844 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.2845  ac_tool_warned=yes ;;
  6.2846  esac
  6.2847      OBJDUMP=$ac_ct_OBJDUMP
  6.2848 @@ -4074,10 +4149,10 @@
  6.2849  
  6.2850  
  6.2851  
  6.2852 -{ echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
  6.2853 -echo $ECHO_N "checking how to recognize dependent libraries... $ECHO_C" >&6; }
  6.2854 +{ $as_echo "$as_me:$LINENO: checking how to recognize dependent libraries" >&5
  6.2855 +$as_echo_n "checking how to recognize dependent libraries... " >&6; }
  6.2856  if test "${lt_cv_deplibs_check_method+set}" = set; then
  6.2857 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2858 +  $as_echo_n "(cached) " >&6
  6.2859  else
  6.2860    lt_cv_file_magic_cmd='$MAGIC_CMD'
  6.2861  lt_cv_file_magic_test_file=
  6.2862 @@ -4272,8 +4347,8 @@
  6.2863  esac
  6.2864  
  6.2865  fi
  6.2866 -{ echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
  6.2867 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6; }
  6.2868 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
  6.2869 +$as_echo "$lt_cv_deplibs_check_method" >&6; }
  6.2870  file_magic_cmd=$lt_cv_file_magic_cmd
  6.2871  deplibs_check_method=$lt_cv_deplibs_check_method
  6.2872  test -z "$deplibs_check_method" && deplibs_check_method=unknown
  6.2873 @@ -4292,10 +4367,10 @@
  6.2874  if test -n "$ac_tool_prefix"; then
  6.2875    # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
  6.2876  set dummy ${ac_tool_prefix}ar; ac_word=$2
  6.2877 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2878 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2879 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2880 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2881  if test "${ac_cv_prog_AR+set}" = set; then
  6.2882 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2883 +  $as_echo_n "(cached) " >&6
  6.2884  else
  6.2885    if test -n "$AR"; then
  6.2886    ac_cv_prog_AR="$AR" # Let the user override the test.
  6.2887 @@ -4308,7 +4383,7 @@
  6.2888    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2889    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2890      ac_cv_prog_AR="${ac_tool_prefix}ar"
  6.2891 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2892 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2893      break 2
  6.2894    fi
  6.2895  done
  6.2896 @@ -4319,11 +4394,11 @@
  6.2897  fi
  6.2898  AR=$ac_cv_prog_AR
  6.2899  if test -n "$AR"; then
  6.2900 -  { echo "$as_me:$LINENO: result: $AR" >&5
  6.2901 -echo "${ECHO_T}$AR" >&6; }
  6.2902 -else
  6.2903 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2904 -echo "${ECHO_T}no" >&6; }
  6.2905 +  { $as_echo "$as_me:$LINENO: result: $AR" >&5
  6.2906 +$as_echo "$AR" >&6; }
  6.2907 +else
  6.2908 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2909 +$as_echo "no" >&6; }
  6.2910  fi
  6.2911  
  6.2912  
  6.2913 @@ -4332,10 +4407,10 @@
  6.2914    ac_ct_AR=$AR
  6.2915    # Extract the first word of "ar", so it can be a program name with args.
  6.2916  set dummy ar; ac_word=$2
  6.2917 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2918 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2919 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2920 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2921  if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
  6.2922 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2923 +  $as_echo_n "(cached) " >&6
  6.2924  else
  6.2925    if test -n "$ac_ct_AR"; then
  6.2926    ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
  6.2927 @@ -4348,7 +4423,7 @@
  6.2928    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2929    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2930      ac_cv_prog_ac_ct_AR="ar"
  6.2931 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2932 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2933      break 2
  6.2934    fi
  6.2935  done
  6.2936 @@ -4359,11 +4434,11 @@
  6.2937  fi
  6.2938  ac_ct_AR=$ac_cv_prog_ac_ct_AR
  6.2939  if test -n "$ac_ct_AR"; then
  6.2940 -  { echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
  6.2941 -echo "${ECHO_T}$ac_ct_AR" >&6; }
  6.2942 -else
  6.2943 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2944 -echo "${ECHO_T}no" >&6; }
  6.2945 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
  6.2946 +$as_echo "$ac_ct_AR" >&6; }
  6.2947 +else
  6.2948 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.2949 +$as_echo "no" >&6; }
  6.2950  fi
  6.2951  
  6.2952    if test "x$ac_ct_AR" = x; then
  6.2953 @@ -4371,12 +4446,8 @@
  6.2954    else
  6.2955      case $cross_compiling:$ac_tool_warned in
  6.2956  yes:)
  6.2957 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.2958 -whose name does not start with the host triplet.  If you think this
  6.2959 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.2960 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.2961 -whose name does not start with the host triplet.  If you think this
  6.2962 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.2963 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.2964 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.2965  ac_tool_warned=yes ;;
  6.2966  esac
  6.2967      AR=$ac_ct_AR
  6.2968 @@ -4401,10 +4472,10 @@
  6.2969  if test -n "$ac_tool_prefix"; then
  6.2970    # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
  6.2971  set dummy ${ac_tool_prefix}strip; ac_word=$2
  6.2972 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2973 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.2974 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.2975 +$as_echo_n "checking for $ac_word... " >&6; }
  6.2976  if test "${ac_cv_prog_STRIP+set}" = set; then
  6.2977 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.2978 +  $as_echo_n "(cached) " >&6
  6.2979  else
  6.2980    if test -n "$STRIP"; then
  6.2981    ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
  6.2982 @@ -4417,7 +4488,7 @@
  6.2983    for ac_exec_ext in '' $ac_executable_extensions; do
  6.2984    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.2985      ac_cv_prog_STRIP="${ac_tool_prefix}strip"
  6.2986 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2987 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.2988      break 2
  6.2989    fi
  6.2990  done
  6.2991 @@ -4428,11 +4499,11 @@
  6.2992  fi
  6.2993  STRIP=$ac_cv_prog_STRIP
  6.2994  if test -n "$STRIP"; then
  6.2995 -  { echo "$as_me:$LINENO: result: $STRIP" >&5
  6.2996 -echo "${ECHO_T}$STRIP" >&6; }
  6.2997 -else
  6.2998 -  { echo "$as_me:$LINENO: result: no" >&5
  6.2999 -echo "${ECHO_T}no" >&6; }
  6.3000 +  { $as_echo "$as_me:$LINENO: result: $STRIP" >&5
  6.3001 +$as_echo "$STRIP" >&6; }
  6.3002 +else
  6.3003 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3004 +$as_echo "no" >&6; }
  6.3005  fi
  6.3006  
  6.3007  
  6.3008 @@ -4441,10 +4512,10 @@
  6.3009    ac_ct_STRIP=$STRIP
  6.3010    # Extract the first word of "strip", so it can be a program name with args.
  6.3011  set dummy strip; ac_word=$2
  6.3012 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3013 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3014 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3015 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3016  if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
  6.3017 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3018 +  $as_echo_n "(cached) " >&6
  6.3019  else
  6.3020    if test -n "$ac_ct_STRIP"; then
  6.3021    ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
  6.3022 @@ -4457,7 +4528,7 @@
  6.3023    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3024    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3025      ac_cv_prog_ac_ct_STRIP="strip"
  6.3026 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3027 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3028      break 2
  6.3029    fi
  6.3030  done
  6.3031 @@ -4468,11 +4539,11 @@
  6.3032  fi
  6.3033  ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
  6.3034  if test -n "$ac_ct_STRIP"; then
  6.3035 -  { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
  6.3036 -echo "${ECHO_T}$ac_ct_STRIP" >&6; }
  6.3037 -else
  6.3038 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3039 -echo "${ECHO_T}no" >&6; }
  6.3040 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
  6.3041 +$as_echo "$ac_ct_STRIP" >&6; }
  6.3042 +else
  6.3043 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3044 +$as_echo "no" >&6; }
  6.3045  fi
  6.3046  
  6.3047    if test "x$ac_ct_STRIP" = x; then
  6.3048 @@ -4480,12 +4551,8 @@
  6.3049    else
  6.3050      case $cross_compiling:$ac_tool_warned in
  6.3051  yes:)
  6.3052 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3053 -whose name does not start with the host triplet.  If you think this
  6.3054 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3055 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3056 -whose name does not start with the host triplet.  If you think this
  6.3057 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3058 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3059 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3060  ac_tool_warned=yes ;;
  6.3061  esac
  6.3062      STRIP=$ac_ct_STRIP
  6.3063 @@ -4504,10 +4571,10 @@
  6.3064  if test -n "$ac_tool_prefix"; then
  6.3065    # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
  6.3066  set dummy ${ac_tool_prefix}ranlib; ac_word=$2
  6.3067 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3068 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3069 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3070 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3071  if test "${ac_cv_prog_RANLIB+set}" = set; then
  6.3072 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3073 +  $as_echo_n "(cached) " >&6
  6.3074  else
  6.3075    if test -n "$RANLIB"; then
  6.3076    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
  6.3077 @@ -4520,7 +4587,7 @@
  6.3078    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3079    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3080      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
  6.3081 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3082 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3083      break 2
  6.3084    fi
  6.3085  done
  6.3086 @@ -4531,11 +4598,11 @@
  6.3087  fi
  6.3088  RANLIB=$ac_cv_prog_RANLIB
  6.3089  if test -n "$RANLIB"; then
  6.3090 -  { echo "$as_me:$LINENO: result: $RANLIB" >&5
  6.3091 -echo "${ECHO_T}$RANLIB" >&6; }
  6.3092 -else
  6.3093 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3094 -echo "${ECHO_T}no" >&6; }
  6.3095 +  { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
  6.3096 +$as_echo "$RANLIB" >&6; }
  6.3097 +else
  6.3098 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3099 +$as_echo "no" >&6; }
  6.3100  fi
  6.3101  
  6.3102  
  6.3103 @@ -4544,10 +4611,10 @@
  6.3104    ac_ct_RANLIB=$RANLIB
  6.3105    # Extract the first word of "ranlib", so it can be a program name with args.
  6.3106  set dummy ranlib; ac_word=$2
  6.3107 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3108 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3109 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3110 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3111  if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
  6.3112 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3113 +  $as_echo_n "(cached) " >&6
  6.3114  else
  6.3115    if test -n "$ac_ct_RANLIB"; then
  6.3116    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
  6.3117 @@ -4560,7 +4627,7 @@
  6.3118    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3119    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3120      ac_cv_prog_ac_ct_RANLIB="ranlib"
  6.3121 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3122 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3123      break 2
  6.3124    fi
  6.3125  done
  6.3126 @@ -4571,11 +4638,11 @@
  6.3127  fi
  6.3128  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  6.3129  if test -n "$ac_ct_RANLIB"; then
  6.3130 -  { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
  6.3131 -echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
  6.3132 -else
  6.3133 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3134 -echo "${ECHO_T}no" >&6; }
  6.3135 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
  6.3136 +$as_echo "$ac_ct_RANLIB" >&6; }
  6.3137 +else
  6.3138 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3139 +$as_echo "no" >&6; }
  6.3140  fi
  6.3141  
  6.3142    if test "x$ac_ct_RANLIB" = x; then
  6.3143 @@ -4583,12 +4650,8 @@
  6.3144    else
  6.3145      case $cross_compiling:$ac_tool_warned in
  6.3146  yes:)
  6.3147 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3148 -whose name does not start with the host triplet.  If you think this
  6.3149 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3150 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3151 -whose name does not start with the host triplet.  If you think this
  6.3152 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3153 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3154 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3155  ac_tool_warned=yes ;;
  6.3156  esac
  6.3157      RANLIB=$ac_ct_RANLIB
  6.3158 @@ -4665,10 +4728,10 @@
  6.3159  
  6.3160  
  6.3161  # Check for command to grab the raw symbol name followed by C symbol from nm.
  6.3162 -{ echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
  6.3163 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6; }
  6.3164 +{ $as_echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
  6.3165 +$as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
  6.3166  if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
  6.3167 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3168 +  $as_echo_n "(cached) " >&6
  6.3169  else
  6.3170  
  6.3171  # These are sane defaults that work on at least a few old systems.
  6.3172 @@ -4786,14 +4849,14 @@
  6.3173    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.3174    (eval $ac_compile) 2>&5
  6.3175    ac_status=$?
  6.3176 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3177 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3178    (exit $ac_status); }; then
  6.3179      # Now try to grab the symbols.
  6.3180      nlist=conftest.nm
  6.3181      if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
  6.3182    (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
  6.3183    ac_status=$?
  6.3184 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3185 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3186    (exit $ac_status); } && test -s "$nlist"; then
  6.3187        # Try sorting and uniquifying the output.
  6.3188        if sort "$nlist" | uniq > "$nlist"T; then
  6.3189 @@ -4850,7 +4913,7 @@
  6.3190  	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
  6.3191    (eval $ac_link) 2>&5
  6.3192    ac_status=$?
  6.3193 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3194 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3195    (exit $ac_status); } && test -s conftest${ac_exeext}; then
  6.3196  	    pipe_works=yes
  6.3197  	  fi
  6.3198 @@ -4885,11 +4948,11 @@
  6.3199    lt_cv_sys_global_symbol_to_cdecl=
  6.3200  fi
  6.3201  if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
  6.3202 -  { echo "$as_me:$LINENO: result: failed" >&5
  6.3203 -echo "${ECHO_T}failed" >&6; }
  6.3204 -else
  6.3205 -  { echo "$as_me:$LINENO: result: ok" >&5
  6.3206 -echo "${ECHO_T}ok" >&6; }
  6.3207 +  { $as_echo "$as_me:$LINENO: result: failed" >&5
  6.3208 +$as_echo "failed" >&6; }
  6.3209 +else
  6.3210 +  { $as_echo "$as_me:$LINENO: result: ok" >&5
  6.3211 +$as_echo "ok" >&6; }
  6.3212  fi
  6.3213  
  6.3214  
  6.3215 @@ -4930,7 +4993,7 @@
  6.3216    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.3217    (eval $ac_compile) 2>&5
  6.3218    ac_status=$?
  6.3219 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3220 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3221    (exit $ac_status); }; then
  6.3222      case `/usr/bin/file conftest.$ac_objext` in
  6.3223        *ELF-32*)
  6.3224 @@ -4945,11 +5008,11 @@
  6.3225    ;;
  6.3226  *-*-irix6*)
  6.3227    # Find out which ABI we are using.
  6.3228 -  echo '#line 4948 "configure"' > conftest.$ac_ext
  6.3229 +  echo '#line 5011 "configure"' > conftest.$ac_ext
  6.3230    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.3231    (eval $ac_compile) 2>&5
  6.3232    ac_status=$?
  6.3233 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3234 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3235    (exit $ac_status); }; then
  6.3236      if test "$lt_cv_prog_gnu_ld" = yes; then
  6.3237        case `/usr/bin/file conftest.$ac_objext` in
  6.3238 @@ -4987,7 +5050,7 @@
  6.3239    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.3240    (eval $ac_compile) 2>&5
  6.3241    ac_status=$?
  6.3242 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3243 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3244    (exit $ac_status); }; then
  6.3245      case `/usr/bin/file conftest.o` in
  6.3246        *32-bit*)
  6.3247 @@ -5017,7 +5080,10 @@
  6.3248  	  x86_64-*linux*)
  6.3249  	    LD="${LD-ld} -m elf_x86_64"
  6.3250  	    ;;
  6.3251 -	  ppc*-*linux*|powerpc*-*linux*)
  6.3252 +	  powerpc64le-*linux*)
  6.3253 +	    LD="${LD-ld} -m elf64lppc"
  6.3254 +	    ;;
  6.3255 +	  powerpc64-*linux*)
  6.3256  	    LD="${LD-ld} -m elf64ppc"
  6.3257  	    ;;
  6.3258  	  s390*-*linux*|s390*-*tpf*)
  6.3259 @@ -5037,10 +5103,10 @@
  6.3260    # On SCO OpenServer 5, we need -belf to get full-featured binaries.
  6.3261    SAVE_CFLAGS="$CFLAGS"
  6.3262    CFLAGS="$CFLAGS -belf"
  6.3263 -  { echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
  6.3264 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6; }
  6.3265 +  { $as_echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
  6.3266 +$as_echo_n "checking whether the C compiler needs -belf... " >&6; }
  6.3267  if test "${lt_cv_cc_needs_belf+set}" = set; then
  6.3268 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3269 +  $as_echo_n "(cached) " >&6
  6.3270  else
  6.3271    ac_ext=c
  6.3272  ac_cpp='$CPP $CPPFLAGS'
  6.3273 @@ -5069,26 +5135,30 @@
  6.3274    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3275    *) ac_try_echo=$ac_try;;
  6.3276  esac
  6.3277 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3278 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3279 +$as_echo "$ac_try_echo") >&5
  6.3280    (eval "$ac_link") 2>conftest.er1
  6.3281    ac_status=$?
  6.3282    grep -v '^ *+' conftest.er1 >conftest.err
  6.3283    rm -f conftest.er1
  6.3284    cat conftest.err >&5
  6.3285 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3286 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3287    (exit $ac_status); } && {
  6.3288  	 test -z "$ac_c_werror_flag" ||
  6.3289  	 test ! -s conftest.err
  6.3290 -       } && test -s conftest$ac_exeext &&
  6.3291 -       $as_test_x conftest$ac_exeext; then
  6.3292 +       } && test -s conftest$ac_exeext && {
  6.3293 +	 test "$cross_compiling" = yes ||
  6.3294 +	 $as_test_x conftest$ac_exeext
  6.3295 +       }; then
  6.3296    lt_cv_cc_needs_belf=yes
  6.3297  else
  6.3298 -  echo "$as_me: failed program was:" >&5
  6.3299 +  $as_echo "$as_me: failed program was:" >&5
  6.3300  sed 's/^/| /' conftest.$ac_ext >&5
  6.3301  
  6.3302  	lt_cv_cc_needs_belf=no
  6.3303  fi
  6.3304  
  6.3305 +rm -rf conftest.dSYM
  6.3306  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  6.3307        conftest$ac_exeext conftest.$ac_ext
  6.3308       ac_ext=c
  6.3309 @@ -5098,8 +5168,8 @@
  6.3310  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  6.3311  
  6.3312  fi
  6.3313 -{ echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
  6.3314 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6; }
  6.3315 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
  6.3316 +$as_echo "$lt_cv_cc_needs_belf" >&6; }
  6.3317    if test x"$lt_cv_cc_needs_belf" != x"yes"; then
  6.3318      # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
  6.3319      CFLAGS="$SAVE_CFLAGS"
  6.3320 @@ -5111,7 +5181,7 @@
  6.3321    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.3322    (eval $ac_compile) 2>&5
  6.3323    ac_status=$?
  6.3324 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3325 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3326    (exit $ac_status); }; then
  6.3327      case `/usr/bin/file conftest.o` in
  6.3328      *64-bit*)
  6.3329 @@ -5138,10 +5208,10 @@
  6.3330      if test -n "$ac_tool_prefix"; then
  6.3331    # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args.
  6.3332  set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
  6.3333 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3334 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3335 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3336 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3337  if test "${ac_cv_prog_DSYMUTIL+set}" = set; then
  6.3338 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3339 +  $as_echo_n "(cached) " >&6
  6.3340  else
  6.3341    if test -n "$DSYMUTIL"; then
  6.3342    ac_cv_prog_DSYMUTIL="$DSYMUTIL" # Let the user override the test.
  6.3343 @@ -5154,7 +5224,7 @@
  6.3344    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3345    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3346      ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
  6.3347 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3348 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3349      break 2
  6.3350    fi
  6.3351  done
  6.3352 @@ -5165,11 +5235,11 @@
  6.3353  fi
  6.3354  DSYMUTIL=$ac_cv_prog_DSYMUTIL
  6.3355  if test -n "$DSYMUTIL"; then
  6.3356 -  { echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
  6.3357 -echo "${ECHO_T}$DSYMUTIL" >&6; }
  6.3358 -else
  6.3359 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3360 -echo "${ECHO_T}no" >&6; }
  6.3361 +  { $as_echo "$as_me:$LINENO: result: $DSYMUTIL" >&5
  6.3362 +$as_echo "$DSYMUTIL" >&6; }
  6.3363 +else
  6.3364 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3365 +$as_echo "no" >&6; }
  6.3366  fi
  6.3367  
  6.3368  
  6.3369 @@ -5178,10 +5248,10 @@
  6.3370    ac_ct_DSYMUTIL=$DSYMUTIL
  6.3371    # Extract the first word of "dsymutil", so it can be a program name with args.
  6.3372  set dummy dsymutil; ac_word=$2
  6.3373 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3374 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3375 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3376 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3377  if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then
  6.3378 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3379 +  $as_echo_n "(cached) " >&6
  6.3380  else
  6.3381    if test -n "$ac_ct_DSYMUTIL"; then
  6.3382    ac_cv_prog_ac_ct_DSYMUTIL="$ac_ct_DSYMUTIL" # Let the user override the test.
  6.3383 @@ -5194,7 +5264,7 @@
  6.3384    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3385    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3386      ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
  6.3387 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3388 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3389      break 2
  6.3390    fi
  6.3391  done
  6.3392 @@ -5205,11 +5275,11 @@
  6.3393  fi
  6.3394  ac_ct_DSYMUTIL=$ac_cv_prog_ac_ct_DSYMUTIL
  6.3395  if test -n "$ac_ct_DSYMUTIL"; then
  6.3396 -  { echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
  6.3397 -echo "${ECHO_T}$ac_ct_DSYMUTIL" >&6; }
  6.3398 -else
  6.3399 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3400 -echo "${ECHO_T}no" >&6; }
  6.3401 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_DSYMUTIL" >&5
  6.3402 +$as_echo "$ac_ct_DSYMUTIL" >&6; }
  6.3403 +else
  6.3404 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3405 +$as_echo "no" >&6; }
  6.3406  fi
  6.3407  
  6.3408    if test "x$ac_ct_DSYMUTIL" = x; then
  6.3409 @@ -5217,12 +5287,8 @@
  6.3410    else
  6.3411      case $cross_compiling:$ac_tool_warned in
  6.3412  yes:)
  6.3413 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3414 -whose name does not start with the host triplet.  If you think this
  6.3415 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3416 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3417 -whose name does not start with the host triplet.  If you think this
  6.3418 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3419 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3420 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3421  ac_tool_warned=yes ;;
  6.3422  esac
  6.3423      DSYMUTIL=$ac_ct_DSYMUTIL
  6.3424 @@ -5234,10 +5300,10 @@
  6.3425      if test -n "$ac_tool_prefix"; then
  6.3426    # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args.
  6.3427  set dummy ${ac_tool_prefix}nmedit; ac_word=$2
  6.3428 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3429 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3430 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3431 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3432  if test "${ac_cv_prog_NMEDIT+set}" = set; then
  6.3433 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3434 +  $as_echo_n "(cached) " >&6
  6.3435  else
  6.3436    if test -n "$NMEDIT"; then
  6.3437    ac_cv_prog_NMEDIT="$NMEDIT" # Let the user override the test.
  6.3438 @@ -5250,7 +5316,7 @@
  6.3439    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3440    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3441      ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
  6.3442 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3443 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3444      break 2
  6.3445    fi
  6.3446  done
  6.3447 @@ -5261,11 +5327,11 @@
  6.3448  fi
  6.3449  NMEDIT=$ac_cv_prog_NMEDIT
  6.3450  if test -n "$NMEDIT"; then
  6.3451 -  { echo "$as_me:$LINENO: result: $NMEDIT" >&5
  6.3452 -echo "${ECHO_T}$NMEDIT" >&6; }
  6.3453 -else
  6.3454 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3455 -echo "${ECHO_T}no" >&6; }
  6.3456 +  { $as_echo "$as_me:$LINENO: result: $NMEDIT" >&5
  6.3457 +$as_echo "$NMEDIT" >&6; }
  6.3458 +else
  6.3459 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3460 +$as_echo "no" >&6; }
  6.3461  fi
  6.3462  
  6.3463  
  6.3464 @@ -5274,10 +5340,10 @@
  6.3465    ac_ct_NMEDIT=$NMEDIT
  6.3466    # Extract the first word of "nmedit", so it can be a program name with args.
  6.3467  set dummy nmedit; ac_word=$2
  6.3468 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3469 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3470 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3471 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3472  if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then
  6.3473 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3474 +  $as_echo_n "(cached) " >&6
  6.3475  else
  6.3476    if test -n "$ac_ct_NMEDIT"; then
  6.3477    ac_cv_prog_ac_ct_NMEDIT="$ac_ct_NMEDIT" # Let the user override the test.
  6.3478 @@ -5290,7 +5356,7 @@
  6.3479    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3480    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3481      ac_cv_prog_ac_ct_NMEDIT="nmedit"
  6.3482 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3483 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3484      break 2
  6.3485    fi
  6.3486  done
  6.3487 @@ -5301,11 +5367,11 @@
  6.3488  fi
  6.3489  ac_ct_NMEDIT=$ac_cv_prog_ac_ct_NMEDIT
  6.3490  if test -n "$ac_ct_NMEDIT"; then
  6.3491 -  { echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
  6.3492 -echo "${ECHO_T}$ac_ct_NMEDIT" >&6; }
  6.3493 -else
  6.3494 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3495 -echo "${ECHO_T}no" >&6; }
  6.3496 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_NMEDIT" >&5
  6.3497 +$as_echo "$ac_ct_NMEDIT" >&6; }
  6.3498 +else
  6.3499 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3500 +$as_echo "no" >&6; }
  6.3501  fi
  6.3502  
  6.3503    if test "x$ac_ct_NMEDIT" = x; then
  6.3504 @@ -5313,12 +5379,8 @@
  6.3505    else
  6.3506      case $cross_compiling:$ac_tool_warned in
  6.3507  yes:)
  6.3508 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3509 -whose name does not start with the host triplet.  If you think this
  6.3510 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3511 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3512 -whose name does not start with the host triplet.  If you think this
  6.3513 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3514 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3515 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3516  ac_tool_warned=yes ;;
  6.3517  esac
  6.3518      NMEDIT=$ac_ct_NMEDIT
  6.3519 @@ -5330,10 +5392,10 @@
  6.3520      if test -n "$ac_tool_prefix"; then
  6.3521    # Extract the first word of "${ac_tool_prefix}lipo", so it can be a program name with args.
  6.3522  set dummy ${ac_tool_prefix}lipo; ac_word=$2
  6.3523 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3524 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3525 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3526 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3527  if test "${ac_cv_prog_LIPO+set}" = set; then
  6.3528 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3529 +  $as_echo_n "(cached) " >&6
  6.3530  else
  6.3531    if test -n "$LIPO"; then
  6.3532    ac_cv_prog_LIPO="$LIPO" # Let the user override the test.
  6.3533 @@ -5346,7 +5408,7 @@
  6.3534    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3535    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3536      ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
  6.3537 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3538 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3539      break 2
  6.3540    fi
  6.3541  done
  6.3542 @@ -5357,11 +5419,11 @@
  6.3543  fi
  6.3544  LIPO=$ac_cv_prog_LIPO
  6.3545  if test -n "$LIPO"; then
  6.3546 -  { echo "$as_me:$LINENO: result: $LIPO" >&5
  6.3547 -echo "${ECHO_T}$LIPO" >&6; }
  6.3548 -else
  6.3549 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3550 -echo "${ECHO_T}no" >&6; }
  6.3551 +  { $as_echo "$as_me:$LINENO: result: $LIPO" >&5
  6.3552 +$as_echo "$LIPO" >&6; }
  6.3553 +else
  6.3554 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3555 +$as_echo "no" >&6; }
  6.3556  fi
  6.3557  
  6.3558  
  6.3559 @@ -5370,10 +5432,10 @@
  6.3560    ac_ct_LIPO=$LIPO
  6.3561    # Extract the first word of "lipo", so it can be a program name with args.
  6.3562  set dummy lipo; ac_word=$2
  6.3563 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3564 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3565 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3566 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3567  if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then
  6.3568 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3569 +  $as_echo_n "(cached) " >&6
  6.3570  else
  6.3571    if test -n "$ac_ct_LIPO"; then
  6.3572    ac_cv_prog_ac_ct_LIPO="$ac_ct_LIPO" # Let the user override the test.
  6.3573 @@ -5386,7 +5448,7 @@
  6.3574    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3575    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3576      ac_cv_prog_ac_ct_LIPO="lipo"
  6.3577 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3578 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3579      break 2
  6.3580    fi
  6.3581  done
  6.3582 @@ -5397,11 +5459,11 @@
  6.3583  fi
  6.3584  ac_ct_LIPO=$ac_cv_prog_ac_ct_LIPO
  6.3585  if test -n "$ac_ct_LIPO"; then
  6.3586 -  { echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
  6.3587 -echo "${ECHO_T}$ac_ct_LIPO" >&6; }
  6.3588 -else
  6.3589 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3590 -echo "${ECHO_T}no" >&6; }
  6.3591 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_LIPO" >&5
  6.3592 +$as_echo "$ac_ct_LIPO" >&6; }
  6.3593 +else
  6.3594 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3595 +$as_echo "no" >&6; }
  6.3596  fi
  6.3597  
  6.3598    if test "x$ac_ct_LIPO" = x; then
  6.3599 @@ -5409,12 +5471,8 @@
  6.3600    else
  6.3601      case $cross_compiling:$ac_tool_warned in
  6.3602  yes:)
  6.3603 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3604 -whose name does not start with the host triplet.  If you think this
  6.3605 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3606 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3607 -whose name does not start with the host triplet.  If you think this
  6.3608 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3609 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3610 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3611  ac_tool_warned=yes ;;
  6.3612  esac
  6.3613      LIPO=$ac_ct_LIPO
  6.3614 @@ -5426,10 +5484,10 @@
  6.3615      if test -n "$ac_tool_prefix"; then
  6.3616    # Extract the first word of "${ac_tool_prefix}otool", so it can be a program name with args.
  6.3617  set dummy ${ac_tool_prefix}otool; ac_word=$2
  6.3618 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3619 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3620 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3621 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3622  if test "${ac_cv_prog_OTOOL+set}" = set; then
  6.3623 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3624 +  $as_echo_n "(cached) " >&6
  6.3625  else
  6.3626    if test -n "$OTOOL"; then
  6.3627    ac_cv_prog_OTOOL="$OTOOL" # Let the user override the test.
  6.3628 @@ -5442,7 +5500,7 @@
  6.3629    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3630    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3631      ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
  6.3632 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3633 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3634      break 2
  6.3635    fi
  6.3636  done
  6.3637 @@ -5453,11 +5511,11 @@
  6.3638  fi
  6.3639  OTOOL=$ac_cv_prog_OTOOL
  6.3640  if test -n "$OTOOL"; then
  6.3641 -  { echo "$as_me:$LINENO: result: $OTOOL" >&5
  6.3642 -echo "${ECHO_T}$OTOOL" >&6; }
  6.3643 -else
  6.3644 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3645 -echo "${ECHO_T}no" >&6; }
  6.3646 +  { $as_echo "$as_me:$LINENO: result: $OTOOL" >&5
  6.3647 +$as_echo "$OTOOL" >&6; }
  6.3648 +else
  6.3649 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3650 +$as_echo "no" >&6; }
  6.3651  fi
  6.3652  
  6.3653  
  6.3654 @@ -5466,10 +5524,10 @@
  6.3655    ac_ct_OTOOL=$OTOOL
  6.3656    # Extract the first word of "otool", so it can be a program name with args.
  6.3657  set dummy otool; ac_word=$2
  6.3658 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3659 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3660 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3661 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3662  if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then
  6.3663 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3664 +  $as_echo_n "(cached) " >&6
  6.3665  else
  6.3666    if test -n "$ac_ct_OTOOL"; then
  6.3667    ac_cv_prog_ac_ct_OTOOL="$ac_ct_OTOOL" # Let the user override the test.
  6.3668 @@ -5482,7 +5540,7 @@
  6.3669    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3670    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3671      ac_cv_prog_ac_ct_OTOOL="otool"
  6.3672 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3673 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3674      break 2
  6.3675    fi
  6.3676  done
  6.3677 @@ -5493,11 +5551,11 @@
  6.3678  fi
  6.3679  ac_ct_OTOOL=$ac_cv_prog_ac_ct_OTOOL
  6.3680  if test -n "$ac_ct_OTOOL"; then
  6.3681 -  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
  6.3682 -echo "${ECHO_T}$ac_ct_OTOOL" >&6; }
  6.3683 -else
  6.3684 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3685 -echo "${ECHO_T}no" >&6; }
  6.3686 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL" >&5
  6.3687 +$as_echo "$ac_ct_OTOOL" >&6; }
  6.3688 +else
  6.3689 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3690 +$as_echo "no" >&6; }
  6.3691  fi
  6.3692  
  6.3693    if test "x$ac_ct_OTOOL" = x; then
  6.3694 @@ -5505,12 +5563,8 @@
  6.3695    else
  6.3696      case $cross_compiling:$ac_tool_warned in
  6.3697  yes:)
  6.3698 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3699 -whose name does not start with the host triplet.  If you think this
  6.3700 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3701 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3702 -whose name does not start with the host triplet.  If you think this
  6.3703 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3704 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3705 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3706  ac_tool_warned=yes ;;
  6.3707  esac
  6.3708      OTOOL=$ac_ct_OTOOL
  6.3709 @@ -5522,10 +5576,10 @@
  6.3710      if test -n "$ac_tool_prefix"; then
  6.3711    # Extract the first word of "${ac_tool_prefix}otool64", so it can be a program name with args.
  6.3712  set dummy ${ac_tool_prefix}otool64; ac_word=$2
  6.3713 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3714 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3715 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3716 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3717  if test "${ac_cv_prog_OTOOL64+set}" = set; then
  6.3718 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3719 +  $as_echo_n "(cached) " >&6
  6.3720  else
  6.3721    if test -n "$OTOOL64"; then
  6.3722    ac_cv_prog_OTOOL64="$OTOOL64" # Let the user override the test.
  6.3723 @@ -5538,7 +5592,7 @@
  6.3724    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3725    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3726      ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
  6.3727 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3728 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3729      break 2
  6.3730    fi
  6.3731  done
  6.3732 @@ -5549,11 +5603,11 @@
  6.3733  fi
  6.3734  OTOOL64=$ac_cv_prog_OTOOL64
  6.3735  if test -n "$OTOOL64"; then
  6.3736 -  { echo "$as_me:$LINENO: result: $OTOOL64" >&5
  6.3737 -echo "${ECHO_T}$OTOOL64" >&6; }
  6.3738 -else
  6.3739 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3740 -echo "${ECHO_T}no" >&6; }
  6.3741 +  { $as_echo "$as_me:$LINENO: result: $OTOOL64" >&5
  6.3742 +$as_echo "$OTOOL64" >&6; }
  6.3743 +else
  6.3744 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3745 +$as_echo "no" >&6; }
  6.3746  fi
  6.3747  
  6.3748  
  6.3749 @@ -5562,10 +5616,10 @@
  6.3750    ac_ct_OTOOL64=$OTOOL64
  6.3751    # Extract the first word of "otool64", so it can be a program name with args.
  6.3752  set dummy otool64; ac_word=$2
  6.3753 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3754 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.3755 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.3756 +$as_echo_n "checking for $ac_word... " >&6; }
  6.3757  if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then
  6.3758 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3759 +  $as_echo_n "(cached) " >&6
  6.3760  else
  6.3761    if test -n "$ac_ct_OTOOL64"; then
  6.3762    ac_cv_prog_ac_ct_OTOOL64="$ac_ct_OTOOL64" # Let the user override the test.
  6.3763 @@ -5578,7 +5632,7 @@
  6.3764    for ac_exec_ext in '' $ac_executable_extensions; do
  6.3765    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.3766      ac_cv_prog_ac_ct_OTOOL64="otool64"
  6.3767 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3768 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.3769      break 2
  6.3770    fi
  6.3771  done
  6.3772 @@ -5589,11 +5643,11 @@
  6.3773  fi
  6.3774  ac_ct_OTOOL64=$ac_cv_prog_ac_ct_OTOOL64
  6.3775  if test -n "$ac_ct_OTOOL64"; then
  6.3776 -  { echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
  6.3777 -echo "${ECHO_T}$ac_ct_OTOOL64" >&6; }
  6.3778 -else
  6.3779 -  { echo "$as_me:$LINENO: result: no" >&5
  6.3780 -echo "${ECHO_T}no" >&6; }
  6.3781 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_OTOOL64" >&5
  6.3782 +$as_echo "$ac_ct_OTOOL64" >&6; }
  6.3783 +else
  6.3784 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.3785 +$as_echo "no" >&6; }
  6.3786  fi
  6.3787  
  6.3788    if test "x$ac_ct_OTOOL64" = x; then
  6.3789 @@ -5601,12 +5655,8 @@
  6.3790    else
  6.3791      case $cross_compiling:$ac_tool_warned in
  6.3792  yes:)
  6.3793 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.3794 -whose name does not start with the host triplet.  If you think this
  6.3795 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.3796 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.3797 -whose name does not start with the host triplet.  If you think this
  6.3798 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.3799 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.3800 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.3801  ac_tool_warned=yes ;;
  6.3802  esac
  6.3803      OTOOL64=$ac_ct_OTOOL64
  6.3804 @@ -5641,10 +5691,10 @@
  6.3805  
  6.3806  
  6.3807  
  6.3808 -    { echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
  6.3809 -echo $ECHO_N "checking for -single_module linker flag... $ECHO_C" >&6; }
  6.3810 +    { $as_echo "$as_me:$LINENO: checking for -single_module linker flag" >&5
  6.3811 +$as_echo_n "checking for -single_module linker flag... " >&6; }
  6.3812  if test "${lt_cv_apple_cc_single_mod+set}" = set; then
  6.3813 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3814 +  $as_echo_n "(cached) " >&6
  6.3815  else
  6.3816    lt_cv_apple_cc_single_mod=no
  6.3817        if test -z "${LT_MULTI_MODULE}"; then
  6.3818 @@ -5668,12 +5718,12 @@
  6.3819  	rm -f conftest.*
  6.3820        fi
  6.3821  fi
  6.3822 -{ echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
  6.3823 -echo "${ECHO_T}$lt_cv_apple_cc_single_mod" >&6; }
  6.3824 -    { echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
  6.3825 -echo $ECHO_N "checking for -exported_symbols_list linker flag... $ECHO_C" >&6; }
  6.3826 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_apple_cc_single_mod" >&5
  6.3827 +$as_echo "$lt_cv_apple_cc_single_mod" >&6; }
  6.3828 +    { $as_echo "$as_me:$LINENO: checking for -exported_symbols_list linker flag" >&5
  6.3829 +$as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
  6.3830  if test "${lt_cv_ld_exported_symbols_list+set}" = set; then
  6.3831 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3832 +  $as_echo_n "(cached) " >&6
  6.3833  else
  6.3834    lt_cv_ld_exported_symbols_list=no
  6.3835        save_LDFLAGS=$LDFLAGS
  6.3836 @@ -5700,33 +5750,37 @@
  6.3837    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3838    *) ac_try_echo=$ac_try;;
  6.3839  esac
  6.3840 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3841 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3842 +$as_echo "$ac_try_echo") >&5
  6.3843    (eval "$ac_link") 2>conftest.er1
  6.3844    ac_status=$?
  6.3845    grep -v '^ *+' conftest.er1 >conftest.err
  6.3846    rm -f conftest.er1
  6.3847    cat conftest.err >&5
  6.3848 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3849 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3850    (exit $ac_status); } && {
  6.3851  	 test -z "$ac_c_werror_flag" ||
  6.3852  	 test ! -s conftest.err
  6.3853 -       } && test -s conftest$ac_exeext &&
  6.3854 -       $as_test_x conftest$ac_exeext; then
  6.3855 +       } && test -s conftest$ac_exeext && {
  6.3856 +	 test "$cross_compiling" = yes ||
  6.3857 +	 $as_test_x conftest$ac_exeext
  6.3858 +       }; then
  6.3859    lt_cv_ld_exported_symbols_list=yes
  6.3860  else
  6.3861 -  echo "$as_me: failed program was:" >&5
  6.3862 +  $as_echo "$as_me: failed program was:" >&5
  6.3863  sed 's/^/| /' conftest.$ac_ext >&5
  6.3864  
  6.3865  	lt_cv_ld_exported_symbols_list=no
  6.3866  fi
  6.3867  
  6.3868 +rm -rf conftest.dSYM
  6.3869  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  6.3870        conftest$ac_exeext conftest.$ac_ext
  6.3871  	LDFLAGS="$save_LDFLAGS"
  6.3872  
  6.3873  fi
  6.3874 -{ echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
  6.3875 -echo "${ECHO_T}$lt_cv_ld_exported_symbols_list" >&6; }
  6.3876 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_ld_exported_symbols_list" >&5
  6.3877 +$as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
  6.3878      case $host_os in
  6.3879      rhapsody* | darwin1.[012])
  6.3880        _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
  6.3881 @@ -5767,15 +5821,15 @@
  6.3882  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  6.3883  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  6.3884  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  6.3885 -{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
  6.3886 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
  6.3887 +{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
  6.3888 +$as_echo_n "checking how to run the C preprocessor... " >&6; }
  6.3889  # On Suns, sometimes $CPP names a directory.
  6.3890  if test -n "$CPP" && test -d "$CPP"; then
  6.3891    CPP=
  6.3892  fi
  6.3893  if test -z "$CPP"; then
  6.3894    if test "${ac_cv_prog_CPP+set}" = set; then
  6.3895 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.3896 +  $as_echo_n "(cached) " >&6
  6.3897  else
  6.3898        # Double quotes because CPP needs to be expanded
  6.3899      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
  6.3900 @@ -5807,20 +5861,21 @@
  6.3901    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3902    *) ac_try_echo=$ac_try;;
  6.3903  esac
  6.3904 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3905 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3906 +$as_echo "$ac_try_echo") >&5
  6.3907    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  6.3908    ac_status=$?
  6.3909    grep -v '^ *+' conftest.er1 >conftest.err
  6.3910    rm -f conftest.er1
  6.3911    cat conftest.err >&5
  6.3912 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3913 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3914    (exit $ac_status); } >/dev/null && {
  6.3915  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  6.3916  	 test ! -s conftest.err
  6.3917         }; then
  6.3918    :
  6.3919  else
  6.3920 -  echo "$as_me: failed program was:" >&5
  6.3921 +  $as_echo "$as_me: failed program was:" >&5
  6.3922  sed 's/^/| /' conftest.$ac_ext >&5
  6.3923  
  6.3924    # Broken: fails on valid input.
  6.3925 @@ -5844,13 +5899,14 @@
  6.3926    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3927    *) ac_try_echo=$ac_try;;
  6.3928  esac
  6.3929 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3930 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3931 +$as_echo "$ac_try_echo") >&5
  6.3932    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  6.3933    ac_status=$?
  6.3934    grep -v '^ *+' conftest.er1 >conftest.err
  6.3935    rm -f conftest.er1
  6.3936    cat conftest.err >&5
  6.3937 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3938 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3939    (exit $ac_status); } >/dev/null && {
  6.3940  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  6.3941  	 test ! -s conftest.err
  6.3942 @@ -5858,7 +5914,7 @@
  6.3943    # Broken: success on invalid input.
  6.3944  continue
  6.3945  else
  6.3946 -  echo "$as_me: failed program was:" >&5
  6.3947 +  $as_echo "$as_me: failed program was:" >&5
  6.3948  sed 's/^/| /' conftest.$ac_ext >&5
  6.3949  
  6.3950    # Passes both tests.
  6.3951 @@ -5883,8 +5939,8 @@
  6.3952  else
  6.3953    ac_cv_prog_CPP=$CPP
  6.3954  fi
  6.3955 -{ echo "$as_me:$LINENO: result: $CPP" >&5
  6.3956 -echo "${ECHO_T}$CPP" >&6; }
  6.3957 +{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
  6.3958 +$as_echo "$CPP" >&6; }
  6.3959  ac_preproc_ok=false
  6.3960  for ac_c_preproc_warn_flag in '' yes
  6.3961  do
  6.3962 @@ -5912,20 +5968,21 @@
  6.3963    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3964    *) ac_try_echo=$ac_try;;
  6.3965  esac
  6.3966 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3967 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3968 +$as_echo "$ac_try_echo") >&5
  6.3969    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  6.3970    ac_status=$?
  6.3971    grep -v '^ *+' conftest.er1 >conftest.err
  6.3972    rm -f conftest.er1
  6.3973    cat conftest.err >&5
  6.3974 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3975 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.3976    (exit $ac_status); } >/dev/null && {
  6.3977  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  6.3978  	 test ! -s conftest.err
  6.3979         }; then
  6.3980    :
  6.3981  else
  6.3982 -  echo "$as_me: failed program was:" >&5
  6.3983 +  $as_echo "$as_me: failed program was:" >&5
  6.3984  sed 's/^/| /' conftest.$ac_ext >&5
  6.3985  
  6.3986    # Broken: fails on valid input.
  6.3987 @@ -5949,13 +6006,14 @@
  6.3988    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.3989    *) ac_try_echo=$ac_try;;
  6.3990  esac
  6.3991 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.3992 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.3993 +$as_echo "$ac_try_echo") >&5
  6.3994    (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  6.3995    ac_status=$?
  6.3996    grep -v '^ *+' conftest.er1 >conftest.err
  6.3997    rm -f conftest.er1
  6.3998    cat conftest.err >&5
  6.3999 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4000 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4001    (exit $ac_status); } >/dev/null && {
  6.4002  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  6.4003  	 test ! -s conftest.err
  6.4004 @@ -5963,7 +6021,7 @@
  6.4005    # Broken: success on invalid input.
  6.4006  continue
  6.4007  else
  6.4008 -  echo "$as_me: failed program was:" >&5
  6.4009 +  $as_echo "$as_me: failed program was:" >&5
  6.4010  sed 's/^/| /' conftest.$ac_ext >&5
  6.4011  
  6.4012    # Passes both tests.
  6.4013 @@ -5979,11 +6037,13 @@
  6.4014  if $ac_preproc_ok; then
  6.4015    :
  6.4016  else
  6.4017 -  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  6.4018 +  { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
  6.4019 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
  6.4020 +{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
  6.4021  See \`config.log' for more details." >&5
  6.4022 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  6.4023 +$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
  6.4024  See \`config.log' for more details." >&2;}
  6.4025 -   { (exit 1); exit 1; }; }
  6.4026 +   { (exit 1); exit 1; }; }; }
  6.4027  fi
  6.4028  
  6.4029  ac_ext=c
  6.4030 @@ -5993,10 +6053,10 @@
  6.4031  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  6.4032  
  6.4033  
  6.4034 -{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  6.4035 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
  6.4036 +{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
  6.4037 +$as_echo_n "checking for ANSI C header files... " >&6; }
  6.4038  if test "${ac_cv_header_stdc+set}" = set; then
  6.4039 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4040 +  $as_echo_n "(cached) " >&6
  6.4041  else
  6.4042    cat >conftest.$ac_ext <<_ACEOF
  6.4043  /* confdefs.h.  */
  6.4044 @@ -6023,20 +6083,21 @@
  6.4045    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4046    *) ac_try_echo=$ac_try;;
  6.4047  esac
  6.4048 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4049 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4050 +$as_echo "$ac_try_echo") >&5
  6.4051    (eval "$ac_compile") 2>conftest.er1
  6.4052    ac_status=$?
  6.4053    grep -v '^ *+' conftest.er1 >conftest.err
  6.4054    rm -f conftest.er1
  6.4055    cat conftest.err >&5
  6.4056 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4057 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4058    (exit $ac_status); } && {
  6.4059  	 test -z "$ac_c_werror_flag" ||
  6.4060  	 test ! -s conftest.err
  6.4061         } && test -s conftest.$ac_objext; then
  6.4062    ac_cv_header_stdc=yes
  6.4063  else
  6.4064 -  echo "$as_me: failed program was:" >&5
  6.4065 +  $as_echo "$as_me: failed program was:" >&5
  6.4066  sed 's/^/| /' conftest.$ac_ext >&5
  6.4067  
  6.4068  	ac_cv_header_stdc=no
  6.4069 @@ -6061,7 +6122,7 @@
  6.4070  else
  6.4071    ac_cv_header_stdc=no
  6.4072  fi
  6.4073 -rm -f -r conftest*
  6.4074 +rm -f conftest*
  6.4075  
  6.4076  fi
  6.4077  
  6.4078 @@ -6082,7 +6143,7 @@
  6.4079  else
  6.4080    ac_cv_header_stdc=no
  6.4081  fi
  6.4082 -rm -f -r conftest*
  6.4083 +rm -f conftest*
  6.4084  
  6.4085  fi
  6.4086  
  6.4087 @@ -6128,37 +6189,40 @@
  6.4088    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4089    *) ac_try_echo=$ac_try;;
  6.4090  esac
  6.4091 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4092 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4093 +$as_echo "$ac_try_echo") >&5
  6.4094    (eval "$ac_link") 2>&5
  6.4095    ac_status=$?
  6.4096 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4097 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4098    (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  6.4099    { (case "(($ac_try" in
  6.4100    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4101    *) ac_try_echo=$ac_try;;
  6.4102  esac
  6.4103 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4104 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4105 +$as_echo "$ac_try_echo") >&5
  6.4106    (eval "$ac_try") 2>&5
  6.4107    ac_status=$?
  6.4108 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4109 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4110    (exit $ac_status); }; }; then
  6.4111    :
  6.4112  else
  6.4113 -  echo "$as_me: program exited with status $ac_status" >&5
  6.4114 -echo "$as_me: failed program was:" >&5
  6.4115 +  $as_echo "$as_me: program exited with status $ac_status" >&5
  6.4116 +$as_echo "$as_me: failed program was:" >&5
  6.4117  sed 's/^/| /' conftest.$ac_ext >&5
  6.4118  
  6.4119  ( exit $ac_status )
  6.4120  ac_cv_header_stdc=no
  6.4121  fi
  6.4122 +rm -rf conftest.dSYM
  6.4123  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  6.4124  fi
  6.4125  
  6.4126  
  6.4127  fi
  6.4128  fi
  6.4129 -{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
  6.4130 -echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
  6.4131 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
  6.4132 +$as_echo "$ac_cv_header_stdc" >&6; }
  6.4133  if test $ac_cv_header_stdc = yes; then
  6.4134  
  6.4135  cat >>confdefs.h <<\_ACEOF
  6.4136 @@ -6180,11 +6244,11 @@
  6.4137  for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
  6.4138  		  inttypes.h stdint.h unistd.h
  6.4139  do
  6.4140 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  6.4141 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
  6.4142 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  6.4143 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  6.4144 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  6.4145 +$as_echo_n "checking for $ac_header... " >&6; }
  6.4146  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  6.4147 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4148 +  $as_echo_n "(cached) " >&6
  6.4149  else
  6.4150    cat >conftest.$ac_ext <<_ACEOF
  6.4151  /* confdefs.h.  */
  6.4152 @@ -6202,20 +6266,21 @@
  6.4153    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4154    *) ac_try_echo=$ac_try;;
  6.4155  esac
  6.4156 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4157 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4158 +$as_echo "$ac_try_echo") >&5
  6.4159    (eval "$ac_compile") 2>conftest.er1
  6.4160    ac_status=$?
  6.4161    grep -v '^ *+' conftest.er1 >conftest.err
  6.4162    rm -f conftest.er1
  6.4163    cat conftest.err >&5
  6.4164 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4165 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4166    (exit $ac_status); } && {
  6.4167  	 test -z "$ac_c_werror_flag" ||
  6.4168  	 test ! -s conftest.err
  6.4169         } && test -s conftest.$ac_objext; then
  6.4170    eval "$as_ac_Header=yes"
  6.4171  else
  6.4172 -  echo "$as_me: failed program was:" >&5
  6.4173 +  $as_echo "$as_me: failed program was:" >&5
  6.4174  sed 's/^/| /' conftest.$ac_ext >&5
  6.4175  
  6.4176  	eval "$as_ac_Header=no"
  6.4177 @@ -6223,12 +6288,15 @@
  6.4178  
  6.4179  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  6.4180  fi
  6.4181 -ac_res=`eval echo '${'$as_ac_Header'}'`
  6.4182 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  6.4183 -echo "${ECHO_T}$ac_res" >&6; }
  6.4184 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
  6.4185 +ac_res=`eval 'as_val=${'$as_ac_Header'}
  6.4186 +		 $as_echo "$as_val"'`
  6.4187 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  6.4188 +$as_echo "$ac_res" >&6; }
  6.4189 +as_val=`eval 'as_val=${'$as_ac_Header'}
  6.4190 +		 $as_echo "$as_val"'`
  6.4191 +   if test "x$as_val" = x""yes; then
  6.4192    cat >>confdefs.h <<_ACEOF
  6.4193 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  6.4194 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  6.4195  _ACEOF
  6.4196  
  6.4197  fi
  6.4198 @@ -6239,11 +6307,11 @@
  6.4199  
  6.4200  for ac_header in dlfcn.h
  6.4201  do
  6.4202 -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  6.4203 -{ echo "$as_me:$LINENO: checking for $ac_header" >&5
  6.4204 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
  6.4205 +as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  6.4206 +{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
  6.4207 +$as_echo_n "checking for $ac_header... " >&6; }
  6.4208  if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
  6.4209 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4210 +  $as_echo_n "(cached) " >&6
  6.4211  else
  6.4212    cat >conftest.$ac_ext <<_ACEOF
  6.4213  /* confdefs.h.  */
  6.4214 @@ -6261,20 +6329,21 @@
  6.4215    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4216    *) ac_try_echo=$ac_try;;
  6.4217  esac
  6.4218 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4219 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4220 +$as_echo "$ac_try_echo") >&5
  6.4221    (eval "$ac_compile") 2>conftest.er1
  6.4222    ac_status=$?
  6.4223    grep -v '^ *+' conftest.er1 >conftest.err
  6.4224    rm -f conftest.er1
  6.4225    cat conftest.err >&5
  6.4226 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4227 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4228    (exit $ac_status); } && {
  6.4229  	 test -z "$ac_c_werror_flag" ||
  6.4230  	 test ! -s conftest.err
  6.4231         } && test -s conftest.$ac_objext; then
  6.4232    eval "$as_ac_Header=yes"
  6.4233  else
  6.4234 -  echo "$as_me: failed program was:" >&5
  6.4235 +  $as_echo "$as_me: failed program was:" >&5
  6.4236  sed 's/^/| /' conftest.$ac_ext >&5
  6.4237  
  6.4238  	eval "$as_ac_Header=no"
  6.4239 @@ -6282,12 +6351,15 @@
  6.4240  
  6.4241  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  6.4242  fi
  6.4243 -ac_res=`eval echo '${'$as_ac_Header'}'`
  6.4244 -	       { echo "$as_me:$LINENO: result: $ac_res" >&5
  6.4245 -echo "${ECHO_T}$ac_res" >&6; }
  6.4246 -if test `eval echo '${'$as_ac_Header'}'` = yes; then
  6.4247 +ac_res=`eval 'as_val=${'$as_ac_Header'}
  6.4248 +		 $as_echo "$as_val"'`
  6.4249 +	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
  6.4250 +$as_echo "$ac_res" >&6; }
  6.4251 +as_val=`eval 'as_val=${'$as_ac_Header'}
  6.4252 +		 $as_echo "$as_val"'`
  6.4253 +   if test "x$as_val" = x""yes; then
  6.4254    cat >>confdefs.h <<_ACEOF
  6.4255 -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
  6.4256 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
  6.4257  _ACEOF
  6.4258  
  6.4259  fi
  6.4260 @@ -6304,10 +6376,10 @@
  6.4261    if test -n "$ac_tool_prefix"; then
  6.4262    # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
  6.4263  set dummy ${ac_tool_prefix}as; ac_word=$2
  6.4264 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4265 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4266 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4267 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4268  if test "${ac_cv_prog_AS+set}" = set; then
  6.4269 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4270 +  $as_echo_n "(cached) " >&6
  6.4271  else
  6.4272    if test -n "$AS"; then
  6.4273    ac_cv_prog_AS="$AS" # Let the user override the test.
  6.4274 @@ -6320,7 +6392,7 @@
  6.4275    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4276    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4277      ac_cv_prog_AS="${ac_tool_prefix}as"
  6.4278 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4279 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4280      break 2
  6.4281    fi
  6.4282  done
  6.4283 @@ -6331,11 +6403,11 @@
  6.4284  fi
  6.4285  AS=$ac_cv_prog_AS
  6.4286  if test -n "$AS"; then
  6.4287 -  { echo "$as_me:$LINENO: result: $AS" >&5
  6.4288 -echo "${ECHO_T}$AS" >&6; }
  6.4289 -else
  6.4290 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4291 -echo "${ECHO_T}no" >&6; }
  6.4292 +  { $as_echo "$as_me:$LINENO: result: $AS" >&5
  6.4293 +$as_echo "$AS" >&6; }
  6.4294 +else
  6.4295 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4296 +$as_echo "no" >&6; }
  6.4297  fi
  6.4298  
  6.4299  
  6.4300 @@ -6344,10 +6416,10 @@
  6.4301    ac_ct_AS=$AS
  6.4302    # Extract the first word of "as", so it can be a program name with args.
  6.4303  set dummy as; ac_word=$2
  6.4304 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4305 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4306 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4307 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4308  if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
  6.4309 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4310 +  $as_echo_n "(cached) " >&6
  6.4311  else
  6.4312    if test -n "$ac_ct_AS"; then
  6.4313    ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test.
  6.4314 @@ -6360,7 +6432,7 @@
  6.4315    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4316    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4317      ac_cv_prog_ac_ct_AS="as"
  6.4318 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4319 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4320      break 2
  6.4321    fi
  6.4322  done
  6.4323 @@ -6371,11 +6443,11 @@
  6.4324  fi
  6.4325  ac_ct_AS=$ac_cv_prog_ac_ct_AS
  6.4326  if test -n "$ac_ct_AS"; then
  6.4327 -  { echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
  6.4328 -echo "${ECHO_T}$ac_ct_AS" >&6; }
  6.4329 -else
  6.4330 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4331 -echo "${ECHO_T}no" >&6; }
  6.4332 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_AS" >&5
  6.4333 +$as_echo "$ac_ct_AS" >&6; }
  6.4334 +else
  6.4335 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4336 +$as_echo "no" >&6; }
  6.4337  fi
  6.4338  
  6.4339    if test "x$ac_ct_AS" = x; then
  6.4340 @@ -6383,12 +6455,8 @@
  6.4341    else
  6.4342      case $cross_compiling:$ac_tool_warned in
  6.4343  yes:)
  6.4344 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.4345 -whose name does not start with the host triplet.  If you think this
  6.4346 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.4347 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.4348 -whose name does not start with the host triplet.  If you think this
  6.4349 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.4350 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.4351 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.4352  ac_tool_warned=yes ;;
  6.4353  esac
  6.4354      AS=$ac_ct_AS
  6.4355 @@ -6400,10 +6468,10 @@
  6.4356    if test -n "$ac_tool_prefix"; then
  6.4357    # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
  6.4358  set dummy ${ac_tool_prefix}dlltool; ac_word=$2
  6.4359 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4360 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4361 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4362 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4363  if test "${ac_cv_prog_DLLTOOL+set}" = set; then
  6.4364 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4365 +  $as_echo_n "(cached) " >&6
  6.4366  else
  6.4367    if test -n "$DLLTOOL"; then
  6.4368    ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
  6.4369 @@ -6416,7 +6484,7 @@
  6.4370    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4371    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4372      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
  6.4373 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4374 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4375      break 2
  6.4376    fi
  6.4377  done
  6.4378 @@ -6427,11 +6495,11 @@
  6.4379  fi
  6.4380  DLLTOOL=$ac_cv_prog_DLLTOOL
  6.4381  if test -n "$DLLTOOL"; then
  6.4382 -  { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
  6.4383 -echo "${ECHO_T}$DLLTOOL" >&6; }
  6.4384 -else
  6.4385 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4386 -echo "${ECHO_T}no" >&6; }
  6.4387 +  { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
  6.4388 +$as_echo "$DLLTOOL" >&6; }
  6.4389 +else
  6.4390 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4391 +$as_echo "no" >&6; }
  6.4392  fi
  6.4393  
  6.4394  
  6.4395 @@ -6440,10 +6508,10 @@
  6.4396    ac_ct_DLLTOOL=$DLLTOOL
  6.4397    # Extract the first word of "dlltool", so it can be a program name with args.
  6.4398  set dummy dlltool; ac_word=$2
  6.4399 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4400 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4401 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4402 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4403  if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
  6.4404 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4405 +  $as_echo_n "(cached) " >&6
  6.4406  else
  6.4407    if test -n "$ac_ct_DLLTOOL"; then
  6.4408    ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
  6.4409 @@ -6456,7 +6524,7 @@
  6.4410    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4411    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4412      ac_cv_prog_ac_ct_DLLTOOL="dlltool"
  6.4413 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4414 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4415      break 2
  6.4416    fi
  6.4417  done
  6.4418 @@ -6467,11 +6535,11 @@
  6.4419  fi
  6.4420  ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
  6.4421  if test -n "$ac_ct_DLLTOOL"; then
  6.4422 -  { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
  6.4423 -echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
  6.4424 -else
  6.4425 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4426 -echo "${ECHO_T}no" >&6; }
  6.4427 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
  6.4428 +$as_echo "$ac_ct_DLLTOOL" >&6; }
  6.4429 +else
  6.4430 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4431 +$as_echo "no" >&6; }
  6.4432  fi
  6.4433  
  6.4434    if test "x$ac_ct_DLLTOOL" = x; then
  6.4435 @@ -6479,12 +6547,8 @@
  6.4436    else
  6.4437      case $cross_compiling:$ac_tool_warned in
  6.4438  yes:)
  6.4439 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.4440 -whose name does not start with the host triplet.  If you think this
  6.4441 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.4442 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.4443 -whose name does not start with the host triplet.  If you think this
  6.4444 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.4445 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.4446 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.4447  ac_tool_warned=yes ;;
  6.4448  esac
  6.4449      DLLTOOL=$ac_ct_DLLTOOL
  6.4450 @@ -6496,10 +6560,10 @@
  6.4451    if test -n "$ac_tool_prefix"; then
  6.4452    # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
  6.4453  set dummy ${ac_tool_prefix}objdump; ac_word=$2
  6.4454 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4455 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4456 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4457 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4458  if test "${ac_cv_prog_OBJDUMP+set}" = set; then
  6.4459 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4460 +  $as_echo_n "(cached) " >&6
  6.4461  else
  6.4462    if test -n "$OBJDUMP"; then
  6.4463    ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test.
  6.4464 @@ -6512,7 +6576,7 @@
  6.4465    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4466    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4467      ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
  6.4468 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4469 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4470      break 2
  6.4471    fi
  6.4472  done
  6.4473 @@ -6523,11 +6587,11 @@
  6.4474  fi
  6.4475  OBJDUMP=$ac_cv_prog_OBJDUMP
  6.4476  if test -n "$OBJDUMP"; then
  6.4477 -  { echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  6.4478 -echo "${ECHO_T}$OBJDUMP" >&6; }
  6.4479 -else
  6.4480 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4481 -echo "${ECHO_T}no" >&6; }
  6.4482 +  { $as_echo "$as_me:$LINENO: result: $OBJDUMP" >&5
  6.4483 +$as_echo "$OBJDUMP" >&6; }
  6.4484 +else
  6.4485 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4486 +$as_echo "no" >&6; }
  6.4487  fi
  6.4488  
  6.4489  
  6.4490 @@ -6536,10 +6600,10 @@
  6.4491    ac_ct_OBJDUMP=$OBJDUMP
  6.4492    # Extract the first word of "objdump", so it can be a program name with args.
  6.4493  set dummy objdump; ac_word=$2
  6.4494 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4495 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
  6.4496 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
  6.4497 +$as_echo_n "checking for $ac_word... " >&6; }
  6.4498  if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
  6.4499 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4500 +  $as_echo_n "(cached) " >&6
  6.4501  else
  6.4502    if test -n "$ac_ct_OBJDUMP"; then
  6.4503    ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test.
  6.4504 @@ -6552,7 +6616,7 @@
  6.4505    for ac_exec_ext in '' $ac_executable_extensions; do
  6.4506    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
  6.4507      ac_cv_prog_ac_ct_OBJDUMP="objdump"
  6.4508 -    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4509 +    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
  6.4510      break 2
  6.4511    fi
  6.4512  done
  6.4513 @@ -6563,11 +6627,11 @@
  6.4514  fi
  6.4515  ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
  6.4516  if test -n "$ac_ct_OBJDUMP"; then
  6.4517 -  { echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  6.4518 -echo "${ECHO_T}$ac_ct_OBJDUMP" >&6; }
  6.4519 -else
  6.4520 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4521 -echo "${ECHO_T}no" >&6; }
  6.4522 +  { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJDUMP" >&5
  6.4523 +$as_echo "$ac_ct_OBJDUMP" >&6; }
  6.4524 +else
  6.4525 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4526 +$as_echo "no" >&6; }
  6.4527  fi
  6.4528  
  6.4529    if test "x$ac_ct_OBJDUMP" = x; then
  6.4530 @@ -6575,12 +6639,8 @@
  6.4531    else
  6.4532      case $cross_compiling:$ac_tool_warned in
  6.4533  yes:)
  6.4534 -{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
  6.4535 -whose name does not start with the host triplet.  If you think this
  6.4536 -configuration is useful to you, please write to autoconf@gnu.org." >&5
  6.4537 -echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
  6.4538 -whose name does not start with the host triplet.  If you think this
  6.4539 -configuration is useful to you, please write to autoconf@gnu.org." >&2;}
  6.4540 +{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
  6.4541 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
  6.4542  ac_tool_warned=yes ;;
  6.4543  esac
  6.4544      OBJDUMP=$ac_ct_OBJDUMP
  6.4545 @@ -6777,10 +6837,10 @@
  6.4546     setopt NO_GLOB_SUBST
  6.4547  fi
  6.4548  
  6.4549 -{ echo "$as_me:$LINENO: checking for objdir" >&5
  6.4550 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6; }
  6.4551 +{ $as_echo "$as_me:$LINENO: checking for objdir" >&5
  6.4552 +$as_echo_n "checking for objdir... " >&6; }
  6.4553  if test "${lt_cv_objdir+set}" = set; then
  6.4554 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4555 +  $as_echo_n "(cached) " >&6
  6.4556  else
  6.4557    rm -f .libs 2>/dev/null
  6.4558  mkdir .libs 2>/dev/null
  6.4559 @@ -6792,8 +6852,8 @@
  6.4560  fi
  6.4561  rmdir .libs 2>/dev/null
  6.4562  fi
  6.4563 -{ echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
  6.4564 -echo "${ECHO_T}$lt_cv_objdir" >&6; }
  6.4565 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
  6.4566 +$as_echo "$lt_cv_objdir" >&6; }
  6.4567  objdir=$lt_cv_objdir
  6.4568  
  6.4569  
  6.4570 @@ -6885,10 +6945,10 @@
  6.4571  case $deplibs_check_method in
  6.4572  file_magic*)
  6.4573    if test "$file_magic_cmd" = '$MAGIC_CMD'; then
  6.4574 -    { echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
  6.4575 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6; }
  6.4576 +    { $as_echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
  6.4577 +$as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
  6.4578  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
  6.4579 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4580 +  $as_echo_n "(cached) " >&6
  6.4581  else
  6.4582    case $MAGIC_CMD in
  6.4583  [\\/*] |  ?:[\\/]*)
  6.4584 @@ -6938,11 +6998,11 @@
  6.4585  
  6.4586  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  6.4587  if test -n "$MAGIC_CMD"; then
  6.4588 -  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  6.4589 -echo "${ECHO_T}$MAGIC_CMD" >&6; }
  6.4590 -else
  6.4591 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4592 -echo "${ECHO_T}no" >&6; }
  6.4593 +  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  6.4594 +$as_echo "$MAGIC_CMD" >&6; }
  6.4595 +else
  6.4596 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4597 +$as_echo "no" >&6; }
  6.4598  fi
  6.4599  
  6.4600  
  6.4601 @@ -6951,10 +7011,10 @@
  6.4602  
  6.4603  if test -z "$lt_cv_path_MAGIC_CMD"; then
  6.4604    if test -n "$ac_tool_prefix"; then
  6.4605 -    { echo "$as_me:$LINENO: checking for file" >&5
  6.4606 -echo $ECHO_N "checking for file... $ECHO_C" >&6; }
  6.4607 +    { $as_echo "$as_me:$LINENO: checking for file" >&5
  6.4608 +$as_echo_n "checking for file... " >&6; }
  6.4609  if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
  6.4610 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4611 +  $as_echo_n "(cached) " >&6
  6.4612  else
  6.4613    case $MAGIC_CMD in
  6.4614  [\\/*] |  ?:[\\/]*)
  6.4615 @@ -7004,11 +7064,11 @@
  6.4616  
  6.4617  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
  6.4618  if test -n "$MAGIC_CMD"; then
  6.4619 -  { echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  6.4620 -echo "${ECHO_T}$MAGIC_CMD" >&6; }
  6.4621 -else
  6.4622 -  { echo "$as_me:$LINENO: result: no" >&5
  6.4623 -echo "${ECHO_T}no" >&6; }
  6.4624 +  { $as_echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
  6.4625 +$as_echo "$MAGIC_CMD" >&6; }
  6.4626 +else
  6.4627 +  { $as_echo "$as_me:$LINENO: result: no" >&5
  6.4628 +$as_echo "no" >&6; }
  6.4629  fi
  6.4630  
  6.4631  
  6.4632 @@ -7088,10 +7148,10 @@
  6.4633  if test "$GCC" = yes; then
  6.4634    lt_prog_compiler_no_builtin_flag=' -fno-builtin'
  6.4635  
  6.4636 -  { echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  6.4637 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6; }
  6.4638 +  { $as_echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
  6.4639 +$as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
  6.4640  if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
  6.4641 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4642 +  $as_echo_n "(cached) " >&6
  6.4643  else
  6.4644    lt_cv_prog_compiler_rtti_exceptions=no
  6.4645     ac_outfile=conftest.$ac_objext
  6.4646 @@ -7106,11 +7166,11 @@
  6.4647     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  6.4648     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  6.4649     -e 's:$: $lt_compiler_flag:'`
  6.4650 -   (eval echo "\"\$as_me:7109: $lt_compile\"" >&5)
  6.4651 +   (eval echo "\"\$as_me:7169: $lt_compile\"" >&5)
  6.4652     (eval "$lt_compile" 2>conftest.err)
  6.4653     ac_status=$?
  6.4654     cat conftest.err >&5
  6.4655 -   echo "$as_me:7113: \$? = $ac_status" >&5
  6.4656 +   echo "$as_me:7173: \$? = $ac_status" >&5
  6.4657     if (exit $ac_status) && test -s "$ac_outfile"; then
  6.4658       # The compiler can only warn and ignore the option if not recognized
  6.4659       # So say no if there are warnings other than the usual output.
  6.4660 @@ -7123,8 +7183,8 @@
  6.4661     $RM conftest*
  6.4662  
  6.4663  fi
  6.4664 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
  6.4665 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  6.4666 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
  6.4667 +$as_echo "$lt_cv_prog_compiler_rtti_exceptions" >&6; }
  6.4668  
  6.4669  if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
  6.4670      lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
  6.4671 @@ -7143,8 +7203,8 @@
  6.4672  lt_prog_compiler_pic=
  6.4673  lt_prog_compiler_static=
  6.4674  
  6.4675 -{ echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
  6.4676 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6; }
  6.4677 +{ $as_echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
  6.4678 +$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
  6.4679  
  6.4680    if test "$GCC" = yes; then
  6.4681      lt_prog_compiler_wl='-Wl,'
  6.4682 @@ -7415,8 +7475,8 @@
  6.4683      lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
  6.4684      ;;
  6.4685  esac
  6.4686 -{ echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
  6.4687 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6; }
  6.4688 +{ $as_echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
  6.4689 +$as_echo "$lt_prog_compiler_pic" >&6; }
  6.4690  
  6.4691  
  6.4692  
  6.4693 @@ -7427,10 +7487,10 @@
  6.4694  # Check to make sure the PIC flag actually works.
  6.4695  #
  6.4696  if test -n "$lt_prog_compiler_pic"; then
  6.4697 -  { echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  6.4698 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6; }
  6.4699 +  { $as_echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
  6.4700 +$as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
  6.4701  if test "${lt_cv_prog_compiler_pic_works+set}" = set; then
  6.4702 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4703 +  $as_echo_n "(cached) " >&6
  6.4704  else
  6.4705    lt_cv_prog_compiler_pic_works=no
  6.4706     ac_outfile=conftest.$ac_objext
  6.4707 @@ -7445,11 +7505,11 @@
  6.4708     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  6.4709     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  6.4710     -e 's:$: $lt_compiler_flag:'`
  6.4711 -   (eval echo "\"\$as_me:7448: $lt_compile\"" >&5)
  6.4712 +   (eval echo "\"\$as_me:7508: $lt_compile\"" >&5)
  6.4713     (eval "$lt_compile" 2>conftest.err)
  6.4714     ac_status=$?
  6.4715     cat conftest.err >&5
  6.4716 -   echo "$as_me:7452: \$? = $ac_status" >&5
  6.4717 +   echo "$as_me:7512: \$? = $ac_status" >&5
  6.4718     if (exit $ac_status) && test -s "$ac_outfile"; then
  6.4719       # The compiler can only warn and ignore the option if not recognized
  6.4720       # So say no if there are warnings other than the usual output.
  6.4721 @@ -7462,8 +7522,8 @@
  6.4722     $RM conftest*
  6.4723  
  6.4724  fi
  6.4725 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
  6.4726 -echo "${ECHO_T}$lt_cv_prog_compiler_pic_works" >&6; }
  6.4727 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_pic_works" >&5
  6.4728 +$as_echo "$lt_cv_prog_compiler_pic_works" >&6; }
  6.4729  
  6.4730  if test x"$lt_cv_prog_compiler_pic_works" = xyes; then
  6.4731      case $lt_prog_compiler_pic in
  6.4732 @@ -7486,10 +7546,10 @@
  6.4733  # Check to make sure the static flag actually works.
  6.4734  #
  6.4735  wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
  6.4736 -{ echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  6.4737 -echo $ECHO_N "checking if $compiler static flag $lt_tmp_static_flag works... $ECHO_C" >&6; }
  6.4738 +{ $as_echo "$as_me:$LINENO: checking if $compiler static flag $lt_tmp_static_flag works" >&5
  6.4739 +$as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
  6.4740  if test "${lt_cv_prog_compiler_static_works+set}" = set; then
  6.4741 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4742 +  $as_echo_n "(cached) " >&6
  6.4743  else
  6.4744    lt_cv_prog_compiler_static_works=no
  6.4745     save_LDFLAGS="$LDFLAGS"
  6.4746 @@ -7514,8 +7574,8 @@
  6.4747     LDFLAGS="$save_LDFLAGS"
  6.4748  
  6.4749  fi
  6.4750 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
  6.4751 -echo "${ECHO_T}$lt_cv_prog_compiler_static_works" >&6; }
  6.4752 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_static_works" >&5
  6.4753 +$as_echo "$lt_cv_prog_compiler_static_works" >&6; }
  6.4754  
  6.4755  if test x"$lt_cv_prog_compiler_static_works" = xyes; then
  6.4756      :
  6.4757 @@ -7529,10 +7589,10 @@
  6.4758  
  6.4759  
  6.4760  
  6.4761 -  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  6.4762 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  6.4763 +  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  6.4764 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  6.4765  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
  6.4766 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4767 +  $as_echo_n "(cached) " >&6
  6.4768  else
  6.4769    lt_cv_prog_compiler_c_o=no
  6.4770     $RM -r conftest 2>/dev/null
  6.4771 @@ -7550,11 +7610,11 @@
  6.4772     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  6.4773     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  6.4774     -e 's:$: $lt_compiler_flag:'`
  6.4775 -   (eval echo "\"\$as_me:7553: $lt_compile\"" >&5)
  6.4776 +   (eval echo "\"\$as_me:7613: $lt_compile\"" >&5)
  6.4777     (eval "$lt_compile" 2>out/conftest.err)
  6.4778     ac_status=$?
  6.4779     cat out/conftest.err >&5
  6.4780 -   echo "$as_me:7557: \$? = $ac_status" >&5
  6.4781 +   echo "$as_me:7617: \$? = $ac_status" >&5
  6.4782     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  6.4783     then
  6.4784       # The compiler can only warn and ignore the option if not recognized
  6.4785 @@ -7576,18 +7636,18 @@
  6.4786     $RM conftest*
  6.4787  
  6.4788  fi
  6.4789 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  6.4790 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
  6.4791 -
  6.4792 -
  6.4793 -
  6.4794 -
  6.4795 -
  6.4796 -
  6.4797 -  { echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  6.4798 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6; }
  6.4799 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  6.4800 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  6.4801 +
  6.4802 +
  6.4803 +
  6.4804 +
  6.4805 +
  6.4806 +
  6.4807 +  { $as_echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
  6.4808 +$as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
  6.4809  if test "${lt_cv_prog_compiler_c_o+set}" = set; then
  6.4810 -  echo $ECHO_N "(cached) $ECHO_C" >&6
  6.4811 +  $as_echo_n "(cached) " >&6
  6.4812  else
  6.4813    lt_cv_prog_compiler_c_o=no
  6.4814     $RM -r conftest 2>/dev/null
  6.4815 @@ -7605,11 +7665,11 @@
  6.4816     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
  6.4817     -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
  6.4818     -e 's:$: $lt_compiler_flag:'`
  6.4819 -   (eval echo "\"\$as_me:7608: $lt_compile\"" >&5)
  6.4820 +   (eval echo "\"\$as_me:7668: $lt_compile\"" >&5)
  6.4821     (eval "$lt_compile" 2>out/conftest.err)
  6.4822     ac_status=$?
  6.4823     cat out/conftest.err >&5
  6.4824 -   echo "$as_me:7612: \$? = $ac_status" >&5
  6.4825 +   echo "$as_me:7672: \$? = $ac_status" >&5
  6.4826     if (exit $ac_status) && test -s out/conftest2.$ac_objext
  6.4827     then
  6.4828       # The compiler can only warn and ignore the option if not recognized
  6.4829 @@ -7631,8 +7691,8 @@
  6.4830     $RM conftest*
  6.4831  
  6.4832  fi
  6.4833 -{ echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  6.4834 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6; }
  6.4835 +{ $as_echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
  6.4836 +$as_echo "$lt_cv_prog_compiler_c_o" >&6; }
  6.4837  
  6.4838  
  6.4839  
  6.4840 @@ -7640,19 +7700,19 @@
  6.4841  hard_links="nottested"
  6.4842  if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
  6.4843    # do not overwrite the value of need_locks provided by the user
  6.4844 -  { echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
  6.4845 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6; }
  6.4846 +  { $as_echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
  6.4847 +$as_echo_n "checking if we can lock with hard links... " >&6; }
  6.4848    hard_links=yes
  6.4849    $RM conftest*
  6.4850    ln conftest.a conftest.b 2>/dev/null && hard_links=no
  6.4851    touch conftest.a
  6.4852    ln conftest.a conftest.b 2>&5 || hard_links=no
  6.4853    ln conftest.a conftest.b 2>/dev/null && hard_links=no
  6.4854 -  { echo "$as_me:$LINENO: result: $hard_links" >&5
  6.4855 -echo "${ECHO_T}$hard_links" >&6; }
  6.4856 +  { $as_echo "$as_me:$LINENO: result: $hard_links" >&5
  6.4857 +$as_echo "$hard_links" >&6; }
  6.4858    if test "$hard_links" = no; then
  6.4859 -    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  6.4860 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
  6.4861 +    { $as_echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
  6.4862 +$as_echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
  6.4863      need_locks=warn
  6.4864    fi
  6.4865  else
  6.4866 @@ -7664,8 +7724,8 @@
  6.4867  
  6.4868  
  6.4869  
  6.4870 -  { echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  6.4871 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6; }
  6.4872 +  { $as_echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
  6.4873 +$as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
  6.4874  
  6.4875    runpath_var=
  6.4876    allow_undefined_flag=
  6.4877 @@ -8127,18 +8187,21 @@
  6.4878    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4879    *) ac_try_echo=$ac_try;;
  6.4880  esac
  6.4881 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4882 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4883 +$as_echo "$ac_try_echo") >&5
  6.4884    (eval "$ac_link") 2>conftest.er1
  6.4885    ac_status=$?
  6.4886    grep -v '^ *+' conftest.er1 >conftest.err
  6.4887    rm -f conftest.er1
  6.4888    cat conftest.err >&5
  6.4889 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4890 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4891    (exit $ac_status); } && {
  6.4892  	 test -z "$ac_c_werror_flag" ||
  6.4893  	 test ! -s conftest.err
  6.4894 -       } && test -s conftest$ac_exeext &&
  6.4895 -       $as_test_x conftest$ac_exeext; then
  6.4896 +       } && test -s conftest$ac_exeext && {
  6.4897 +	 test "$cross_compiling" = yes ||
  6.4898 +	 $as_test_x conftest$ac_exeext
  6.4899 +       }; then
  6.4900  
  6.4901  lt_aix_libpath_sed='
  6.4902      /Import File Strings/,/^$/ {
  6.4903 @@ -8153,12 +8216,13 @@
  6.4904    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6.4905  fi
  6.4906  else
  6.4907 -  echo "$as_me: failed program was:" >&5
  6.4908 -sed 's/^/| /' conftest.$ac_ext >&5
  6.4909 -
  6.4910 -
  6.4911 -fi
  6.4912 -
  6.4913 +  $as_echo "$as_me: failed program was:" >&5
  6.4914 +sed 's/^/| /' conftest.$ac_ext >&5
  6.4915 +
  6.4916 +
  6.4917 +fi
  6.4918 +
  6.4919 +rm -rf conftest.dSYM
  6.4920  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  6.4921        conftest$ac_exeext conftest.$ac_ext
  6.4922  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6.4923 @@ -8194,18 +8258,21 @@
  6.4924    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4925    *) ac_try_echo=$ac_try;;
  6.4926  esac
  6.4927 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4928 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4929 +$as_echo "$ac_try_echo") >&5
  6.4930    (eval "$ac_link") 2>conftest.er1
  6.4931    ac_status=$?
  6.4932    grep -v '^ *+' conftest.er1 >conftest.err
  6.4933    rm -f conftest.er1
  6.4934    cat conftest.err >&5
  6.4935 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4936 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4937    (exit $ac_status); } && {
  6.4938  	 test -z "$ac_c_werror_flag" ||
  6.4939  	 test ! -s conftest.err
  6.4940 -       } && test -s conftest$ac_exeext &&
  6.4941 -       $as_test_x conftest$ac_exeext; then
  6.4942 +       } && test -s conftest$ac_exeext && {
  6.4943 +	 test "$cross_compiling" = yes ||
  6.4944 +	 $as_test_x conftest$ac_exeext
  6.4945 +       }; then
  6.4946  
  6.4947  lt_aix_libpath_sed='
  6.4948      /Import File Strings/,/^$/ {
  6.4949 @@ -8220,12 +8287,13 @@
  6.4950    aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
  6.4951  fi
  6.4952  else
  6.4953 -  echo "$as_me: failed program was:" >&5
  6.4954 -sed 's/^/| /' conftest.$ac_ext >&5
  6.4955 -
  6.4956 -
  6.4957 -fi
  6.4958 -
  6.4959 +  $as_echo "$as_me: failed program was:" >&5
  6.4960 +sed 's/^/| /' conftest.$ac_ext >&5
  6.4961 +
  6.4962 +
  6.4963 +fi
  6.4964 +
  6.4965 +rm -rf conftest.dSYM
  6.4966  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  6.4967        conftest$ac_exeext conftest.$ac_ext
  6.4968  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  6.4969 @@ -8448,27 +8516,31 @@
  6.4970    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  6.4971    *) ac_try_echo=$ac_try;;
  6.4972  esac
  6.4973 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
  6.4974 +eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
  6.4975 +$as_echo "$ac_try_echo") >&5
  6.4976    (eval "$ac_link") 2>conftest.er1
  6.4977    ac_status=$?
  6.4978    grep -v '^ *+' conftest.er1 >conftest.err
  6.4979    rm -f conftest.er1
  6.4980    cat conftest.err >&5
  6.4981 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4982 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.4983    (exit $ac_status); } && {
  6.4984  	 test -z "$ac_c_werror_flag" ||
  6.4985  	 test ! -s conftest.err
  6.4986 -       } && test -s conftest$ac_exeext &&
  6.4987 -       $as_test_x conftest$ac_exeext; then
  6.4988 +       } && test -s conftest$ac_exeext && {
  6.4989 +	 test "$cross_compiling" = yes ||
  6.4990 +	 $as_test_x conftest$ac_exeext
  6.4991 +       }; then
  6.4992    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
  6.4993  
  6.4994  else
  6.4995 -  echo "$as_me: failed program was:" >&5
  6.4996 -sed 's/^/| /' conftest.$ac_ext >&5
  6.4997 -
  6.4998 -
  6.4999 -fi
  6.5000 -
  6.5001 +  $as_echo "$as_me: failed program was:" >&5
  6.5002 +sed 's/^/| /' conftest.$ac_ext >&5
  6.5003 +
  6.5004 +
  6.5005 +fi
  6.5006 +
  6.5007 +rm -rf conftest.dSYM
  6.5008  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
  6.5009        conftest$ac_exeext conftest.$ac_ext
  6.5010          LDFLAGS="$save_LDFLAGS"
  6.5011 @@ -8726,8 +8798,8 @@
  6.5012      fi
  6.5013    fi
  6.5014  
  6.5015 -{ echo "$as_me:$LINENO: result: $ld_shlibs" >&5
  6.5016 -echo "${ECHO_T}$ld_shlibs" >&6; }
  6.5017 +{ $as_echo "$as_me:$LINENO: result: $ld_shlibs" >&5
  6.5018 +$as_echo "$ld_shlibs" >&6; }
  6.5019  test "$ld_shlibs" = no && can_build_shared=no
  6.5020  
  6.5021  with_gnu_ld=$with_gnu_ld
  6.5022 @@ -8763,15 +8835,15 @@
  6.5023        # Test whether the compiler implicitly links with -lc since on some
  6.5024        # systems, -lgcc has to come before -lc. If gcc already passes -lc
  6.5025        # to ld, don't add -lc before -lgcc.
  6.5026 -      { echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  6.5027 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6; }
  6.5028 +      { $as_echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
  6.5029 +$as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
  6.5030        $RM conftest*
  6.5031        echo "$lt_simple_compile_test_code" > conftest.$ac_ext
  6.5032  
  6.5033        if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  6.5034    (eval $ac_compile) 2>&5
  6.5035    ac_status=$?
  6.5036 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.5037 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.5038    (exit $ac_status); } 2>conftest.err; then
  6.5039          soname=conftest
  6.5040          lib=conftest
  6.5041 @@ -8789,7 +8861,7 @@
  6.5042          if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\"") >&5
  6.5043    (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
  6.5044    ac_status=$?
  6.5045 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.5046 +  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  6.5047    (exit $ac_status); }
  6.5048          then
  6.5049  	  archive_cmds_need_lc=no
  6.5050 @@ -8801,8 +8873,8 @@
  6.5051          cat conftest.err 1>&5
  6.5052        fi
  6.5053        $RM conftest*
  6.5054 -      { echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
  6.5055 -echo "${ECHO_T}$archive_cmds_need_lc" >&6; }
  6.5056 +      { $as_echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
  6.5057 +$as_echo "$archive_cmds_need_lc" >&6; }
  6.5058        ;;
  6.5059      esac
  6.5060    fi
  6.5061 @@ -8965,8 +9037,8 @@
  6.5062  
  6.5063  
  6.5064  
  6.5065 -  { echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
  6.5066 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6; }
  6.5067 +  { $as_echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
  6.5068 +$as_echo_n "checking dynamic linker characteristics... " >&6; }
  6.5069  
  6.5070  if test "$GCC" = yes; then
  6.5071    case $host_os in
  6.5072 @@ -9410,29 +9482,33 @@
  6.5073    *\"* | *\`* | *\\*) ac_try_ech