configure tweaks, support $libc_add_on_config_subdirs

2009-09-15 14:14:42 -07:00 · 2009-09-15 14:14:42 -07:00 · 7967983fd4
parent 02bf610ca8
commit 7967983fd4
27 changed files with 864 additions and 794 deletions
--- a/15
+++ b/15
@ -1,3 +1,18 @@
 2009-09-15  Roland McGrath  <roland@redhat.com>
 	* aclocal.m4 (GLIBC_PROVIDES): Add _AS_ECHO_PREPARE.
 	* nptl/sysdeps/pthread/configure: Regenerated.
 	* nptl/sysdeps/x86_64/configure: Regenerated.
 	* sysdeps/unix/sysv/linux/configure: Regenerated.
 	* sysdeps/x86_64/elf/configure: Regenerated.
 	* Makefile (autoconf-it): Set execute bit only on top-level configure.
 	* configure.in: Let add-ons set $libc_add_on_config_subdirs to have
 	the effect of AC_CONFIG_SUBDIRS relative to the add-on directory.
 	* aclocal.m4 (GLIBC_PROVIDES): Add AC_CONFIG_SUBDIRS.
 	* configure: Regenerated.
 2009-09-09  Ulrich Drepper  <drepper@redhat.com>
 	* posix/getconf.c (main): Handle -- on command line.
--- a/2
+++ b/2
@ -44,7 +44,7 @@ endif
 define autoconf-it
@-rm -f $@.new
 $(AUTOCONF) $(ACFLAGS) $< > $@.new
-chmod a-w,a+x $@.new
+chmod a-w$(patsubst %,$(comma)a+x,$(filter .,$(@D))) $@.new
 mv -f $@.new $@
 $(autoconf-it-cvs)
 endef
--- a/aclocal.m4
+++ b/aclocal.m4
@ -5,7 +5,9 @@ dnl AC_REQUIREs or AC_BEFOREs duplicating their code.
 dnl
 define([GLIBC_PROVIDES], [dnl
 AC_PROVIDE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_PROVIDE([AC_CONFIG_SUBDIRS])dnl
 AC_PROVIDE([_AS_ECHO_N_PREPARE])dnl
 AC_PROVIDE([_AS_ECHO_PREPARE])dnl
 AC_PROVIDE([_AS_CR_PREPARE])dnl
 AC_PROVIDE([_AS_TR_SH_PREPARE])dnl
 AC_PROVIDE([AC_PROG_INSTALL])dnl
--- a/31
+++ b/31
@ -727,7 +727,6 @@ submachine
 base_machine
 add_on_subdirs
 add_ons
 subdirs
 libc_cv_nss_crypt
 experimental_malloc
 multi_arch
@ -758,6 +757,7 @@ build_os
 build_vendor
 build_cpu
 build
 subdirs
 target_alias
 host_alias
 build_alias
@ -843,7 +843,8 @@ CPP
 CXX
 CXXFLAGS
 CCC'
-ac_subdirs_all=''
+ac_subdirs_all='
 '
 # Initialize some variables set by options.
 ac_init_help=
@ -2013,6 +2014,11 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 subdirs="$subdirs "
 # Make sure we can run config.sub.
 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
  { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
@ -4007,8 +4013,6 @@ fi
 # An add-on can set this when it wants to disable the sanity check below.
 libc_config_ok=no
 subdirs="$subdirs "
@ -4088,6 +4092,7 @@ $as_echo "$as_me: error: add-on directory \"$libc_add_on\" does not exist" >&2;}
    libc_add_on_frag=$libc_add_on_srcdir/configure
    libc_add_on_canonical=
    libc_add_on_config_subdirs=
    if test -r "$libc_add_on_frag"; then
      { $as_echo "$as_me:$LINENO: running configure fragment for add-on $libc_add_on" >&5
 $as_echo "$as_me: running configure fragment for add-on $libc_add_on" >&6;}
@ -4122,6 +4127,24 @@ $as_echo "$as_me: error: fragment must set \$libc_add_on_canonical" >&2;}
 	  test "$subdir_srcdir" = "\$(..)$d" || config_vars="$config_vars
 $d-srcdir = $subdir_srcdir"
 	done
 	for d in $libc_add_on_config_subdirs; do
 	  case "$d" in
 	  /*) { { $as_echo "$as_me:$LINENO: error: fragment uses absolute path in \$libc_add_on_config_subdirs" >&5
 $as_echo "$as_me: error: fragment uses absolute path in \$libc_add_on_config_subdirs" >&2;}
   { (exit 1); exit 1; }; } ;;
 	  esac
 	  if test ! -d "$libc_add_on_srcdir/$d"; then
 	    { { $as_echo "$as_me:$LINENO: error: fragment wants to configure missing directory $d" >&5
 $as_echo "$as_me: error: fragment wants to configure missing directory $d" >&2;}
   { (exit 1); exit 1; }; }
 	  fi
 	  case "$libc_add_on" in
 	  /*) { { $as_echo "$as_me:$LINENO: error: relative path required for add-on using \$libc_add_on_config_subdirs" >&5
 $as_echo "$as_me: error: relative path required for add-on using \$libc_add_on_config_subdirs" >&2;}
   { (exit 1); exit 1; }; } ;;
 	  esac
 	  subdirs="$subdirs $libc_add_on/$d"
 	done
      }
    fi
    if test -n "$libc_add_on"; then
--- a/configure.in
+++ b/configure.in
@ -6,6 +6,9 @@ AC_CONFIG_SRCDIR([include/features.h])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([scripts])
 dnl This is here so we can set $subdirs directly based on configure fragments.
 AC_CONFIG_SUBDIRS()
 AC_CANONICAL_HOST
 AC_PROG_CC
@ -458,6 +461,7 @@ if test x"$add_ons" != x; then
    libc_add_on_frag=$libc_add_on_srcdir/configure
    libc_add_on_canonical=
    libc_add_on_config_subdirs=
    if test -r "$libc_add_on_frag"; then
      AC_MSG_NOTICE(running configure fragment for add-on $libc_add_on)
      libc_add_on_canonical=unknown
@ -489,6 +493,20 @@ if test x"$add_ons" != x; then
 	  test "$subdir_srcdir" = "\$(..)$d" || config_vars="$config_vars
 $d-srcdir = $subdir_srcdir"
 	done
 	for d in $libc_add_on_config_subdirs; do
 	  case "$d" in
 	  /*) AC_MSG_ERROR(dnl
 fragment uses absolute path in \$libc_add_on_config_subdirs) ;;
 	  esac
 	  if test ! -d "$libc_add_on_srcdir/$d"; then
 	    AC_MSG_ERROR(fragment wants to configure missing directory $d)
 	  fi
 	  case "$libc_add_on" in
 	  /*) AC_MSG_ERROR(dnl
 relative path required for add-on using \$libc_add_on_config_subdirs) ;;
 	  esac
 	  subdirs="$subdirs $libc_add_on/$d"
 	done
      }
    fi
    if test -n "$libc_add_on"; then
--- a/nptl/sysdeps/pthread/configure
+++ b/nptl/sysdeps/pthread/configure
@ -1,33 +1,33 @@
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
 if test "x$libc_cv_gcc___thread" != xyes; then
-  { { echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5
+  { { $as_echo "$as_me:$LINENO: error: compiler support for __thread is required" >&5
-echo "$as_me: error: compiler support for __thread is required" >&2;}
+$as_echo "$as_me: error: compiler support for __thread is required" >&2;}
   { (exit 1); exit 1; }; }
 fi
 if test "x${libc_cv_visibility_attribute}" != xyes ||
   test "x${libc_cv_broken_visibility_attribute}" != xno; then
-  { { echo "$as_me:$LINENO: error: working compiler support for visibility attribute is required" >&5
+  { { $as_echo "$as_me:$LINENO: error: working compiler support for visibility attribute is required" >&5
-echo "$as_me: error: working compiler support for visibility attribute is required" >&2;}
+$as_echo "$as_me: error: working compiler support for visibility attribute is required" >&2;}
   { (exit 1); exit 1; }; }
 fi
 if test "x$libc_cv_asm_cfi_directives" != xyes; then
    case "$base_machine" in
    i386 | x86_64 | powerpc | s390)
-      { { echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5
+      { { $as_echo "$as_me:$LINENO: error: CFI directive support in assembler is required" >&5
-echo "$as_me: error: CFI directive support in assembler is required" >&2;}
+$as_echo "$as_me: error: CFI directive support in assembler is required" >&2;}
   { (exit 1); exit 1; }; } ;;
    *) ;;
  esac
 fi
-{ echo "$as_me:$LINENO: checking for forced unwind support" >&5
+{ $as_echo "$as_me:$LINENO: checking for forced unwind support" >&5
-echo $ECHO_N "checking for forced unwind support... $ECHO_C" >&6; }
+$as_echo_n "checking for forced unwind support... " >&6; }
 if test "${libc_cv_forced_unwind+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -53,31 +53,35 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_link") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
+       } && test -s conftest$ac_exeext && {
-       $as_test_x conftest$ac_exeext; then
+	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
       }; then
  libc_cv_forced_unwind=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	libc_cv_forced_unwind=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_forced_unwind" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_forced_unwind" >&5
-echo "${ECHO_T}$libc_cv_forced_unwind" >&6; }
+$as_echo "$libc_cv_forced_unwind" >&6; }
 if test $libc_cv_forced_unwind = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_FORCED_UNWIND 1
@ -85,10 +89,10 @@ _ACEOF
  old_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -Werror -fexceptions"
-  { echo "$as_me:$LINENO: checking for C cleanup handling" >&5
+  { $as_echo "$as_me:$LINENO: checking for C cleanup handling" >&5
-echo $ECHO_N "checking for C cleanup handling... $ECHO_C" >&6; }
+$as_echo_n "checking for C cleanup handling... " >&6; }
 if test "${libc_cv_c_cleanup+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
    cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -115,39 +119,43 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_link") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
+       } && test -s conftest$ac_exeext && {
-       $as_test_x conftest$ac_exeext; then
+	 test "$cross_compiling" = yes ||
 	 $as_test_x conftest$ac_exeext
       }; then
  libc_cv_c_cleanup=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	libc_cv_c_cleanup=no
 fi
 rm -rf conftest.dSYM
 rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
      conftest$ac_exeext conftest.$ac_ext
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_c_cleanup" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_c_cleanup" >&5
-echo "${ECHO_T}$libc_cv_c_cleanup" >&6; }
+$as_echo "$libc_cv_c_cleanup" >&6; }
  CFLAGS="$old_CFLAGS"
  if test $libc_cv_c_cleanup = no; then
-    { { echo "$as_me:$LINENO: error: the compiler must support C cleanup handling" >&5
+    { { $as_echo "$as_me:$LINENO: error: the compiler must support C cleanup handling" >&5
-echo "$as_me: error: the compiler must support C cleanup handling" >&2;}
+$as_echo "$as_me: error: the compiler must support C cleanup handling" >&2;}
   { (exit 1); exit 1; }; }
  fi
 else
-  { { echo "$as_me:$LINENO: error: forced unwind support is required" >&5
+  { { $as_echo "$as_me:$LINENO: error: forced unwind support is required" >&5
-echo "$as_me: error: forced unwind support is required" >&2;}
+$as_echo "$as_me: error: forced unwind support is required" >&2;}
   { (exit 1); exit 1; }; }
 fi
--- a/nptl/sysdeps/x86_64/configure
+++ b/nptl/sysdeps/x86_64/configure
@ -1,35 +1,3 @@
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
  as_echo='printf %s\n'
  as_echo_n='printf %s'
 else
  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
    as_echo_n='/usr/ucb/echo -n'
  else
    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
    as_echo_n_body='eval
      arg=$1;
      case $arg in
      *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
      esac;
      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
    '
    export as_echo_n_body
    as_echo_n='sh -c $as_echo_n_body as_echo'
  fi
  export as_echo_body
  as_echo='sh -c $as_echo_body as_echo'
 fi
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
 # Local configure fragment for sysdeps/i386.
--- a/sysdeps/i386/configure
+++ b/sysdeps/i386/configure
@ -39,42 +39,37 @@ ac_includes_default="\
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  # Extract the first word of "grep ggrep" to use in msg output
 if test -z "$GREP"; then
 set dummy grep ggrep; ac_prog_name=$2
 if test "${ac_cv_path_GREP+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -z "$GREP"; then
  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
+  # Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+# Check for GNU ac_path_GREP and select it if it is found.
  # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
@ -89,74 +84,60 @@ case `"$ac_path_GREP" --version 2>&1` in
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-
+      $ac_path_GREP_found && break 3
-    $ac_path_GREP_found && break 3
+    done
  done
 done
 done
 IFS=$as_save_IFS
-
+  if test -z "$ac_cv_path_GREP"; then
-
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-fi
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 GREP="$ac_cv_path_GREP"
 if test -z "$GREP"; then
  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
-fi
+  fi
 else
  ac_cv_path_GREP=$GREP
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+$as_echo "$ac_cv_path_GREP" >&6; }
 GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   then ac_cv_path_EGREP="$GREP -E"
   else
-     # Extract the first word of "egrep" to use in msg output
+     if test -z "$EGREP"; then
 if test -z "$EGREP"; then
 set dummy egrep; ac_prog_name=$2
 if test "${ac_cv_path_EGREP+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
+  # Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+# Check for GNU ac_path_EGREP and select it if it is found.
  # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
@ -171,40 +152,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-
+      $ac_path_EGREP_found && break 3
-    $ac_path_EGREP_found && break 3
+    done
  done
 done
 done
 IFS=$as_save_IFS
-
+  if test -z "$ac_cv_path_EGREP"; then
-
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-fi
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 EGREP="$ac_cv_path_EGREP"
 if test -z "$EGREP"; then
  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
-fi
+  fi
 else
  ac_cv_path_EGREP=$EGREP
 fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+$as_echo "$ac_cv_path_EGREP" >&6; }
 EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+$as_echo_n "checking for ANSI C header files... " >&6; }
 if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -231,20 +203,21 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
       } && test -s conftest.$ac_objext; then
  ac_cv_header_stdc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_cv_header_stdc=no
@ -336,37 +309,40 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_link") 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
  { (case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_try") 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  :
 else
-  echo "$as_me: program exited with status $ac_status" >&5
+  $as_echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+$as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 ( exit $ac_status )
 ac_cv_header_stdc=no
 fi
 rm -rf conftest.dSYM
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+$as_echo "$ac_cv_header_stdc" >&6; }
 if test $ac_cv_header_stdc = yes; then
 cat >>confdefs.h <<\_ACEOF
@ -388,11 +364,11 @@ fi
 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 		  inttypes.h stdint.h unistd.h
 do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+$as_echo_n "checking for $ac_header... " >&6; }
 if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -410,20 +386,21 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
       } && test -s conftest.$ac_objext; then
  eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	eval "$as_ac_Header=no"
@ -431,12 +408,15 @@ fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
+ac_res=`eval 'as_val=${'$as_ac_Header'}
-	       { echo "$as_me:$LINENO: result: $ac_res" >&5
+		 $as_echo "$as_val"'`
-echo "${ECHO_T}$ac_res" >&6; }
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+$as_echo "$ac_res" >&6; }
 as_val=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
   if test "x$as_val" = x""yes; then
  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
 fi
@ -445,17 +425,17 @@ done
 if test "${ac_cv_header_cpuid_h+set}" = set; then
-  { echo "$as_me:$LINENO: checking for cpuid.h" >&5
+  { $as_echo "$as_me:$LINENO: checking for cpuid.h" >&5
-echo $ECHO_N "checking for cpuid.h... $ECHO_C" >&6; }
+$as_echo_n "checking for cpuid.h... " >&6; }
 if test "${ac_cv_header_cpuid_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_cpuid_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpuid_h" >&5
-echo "${ECHO_T}$ac_cv_header_cpuid_h" >&6; }
+$as_echo "$ac_cv_header_cpuid_h" >&6; }
 else
  # Is the header compilable?
-{ echo "$as_me:$LINENO: checking cpuid.h usability" >&5
+{ $as_echo "$as_me:$LINENO: checking cpuid.h usability" >&5
-echo $ECHO_N "checking cpuid.h usability... $ECHO_C" >&6; }
+$as_echo_n "checking cpuid.h usability... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@ -471,32 +451,33 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
       } && test -s conftest.$ac_objext; then
  ac_header_compiler=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 	ac_header_compiler=no
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+$as_echo "$ac_header_compiler" >&6; }
 # Is the header present?
-{ echo "$as_me:$LINENO: checking cpuid.h presence" >&5
+{ $as_echo "$as_me:$LINENO: checking cpuid.h presence" >&5
-echo $ECHO_N "checking cpuid.h presence... $ECHO_C" >&6; }
+$as_echo_n "checking cpuid.h presence... " >&6; }
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@ -510,79 +491,80 @@ case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); } >/dev/null && {
 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
       }; then
  ac_header_preproc=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  ac_header_preproc=no
 fi
 rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+$as_echo "$ac_header_preproc" >&6; }
 # So?  What about this header?
 case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: accepted by the compiler, rejected by the preprocessor!" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: cpuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: proceeding with the compiler's result" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: cpuid.h: proceeding with the compiler's result" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: proceeding with the compiler's result" >&2;}
    ac_header_preproc=yes
    ;;
  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: present but cannot be compiled" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: cpuid.h: present but cannot be compiled" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h:     check for missing prerequisite headers?" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: cpuid.h:     check for missing prerequisite headers?" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: see the Autoconf documentation" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: cpuid.h: see the Autoconf documentation" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h:     section \"Present But Cannot Be Compiled\"" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: cpuid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: proceeding with the preprocessor's result" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: cpuid.h: proceeding with the preprocessor's result" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: cpuid.h: in the future, the compiler will take precedence" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: cpuid.h: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: cpuid.h: in the future, the compiler will take precedence" >&2;}
+$as_echo "$as_me: WARNING: cpuid.h: in the future, the compiler will take precedence" >&2;}
    ;;
 esac
-{ echo "$as_me:$LINENO: checking for cpuid.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for cpuid.h" >&5
-echo $ECHO_N "checking for cpuid.h... $ECHO_C" >&6; }
+$as_echo_n "checking for cpuid.h... " >&6; }
 if test "${ac_cv_header_cpuid_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  ac_cv_header_cpuid_h=$ac_header_preproc
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_cpuid_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_cpuid_h" >&5
-echo "${ECHO_T}$ac_cv_header_cpuid_h" >&6; }
+$as_echo "$ac_cv_header_cpuid_h" >&6; }
 fi
-if test $ac_cv_header_cpuid_h = yes; then
+if test "x$ac_cv_header_cpuid_h" = x""yes; then
  :
 else
-  { { echo "$as_me:$LINENO: error: gcc must provide the <cpuid.h> header" >&5
+  { { $as_echo "$as_me:$LINENO: error: gcc must provide the <cpuid.h> header" >&5
-echo "$as_me: error: gcc must provide the <cpuid.h> header" >&2;}
+$as_echo "$as_me: error: gcc must provide the <cpuid.h> header" >&2;}
   { (exit 1); exit 1; }; }
 fi
-{ echo "$as_me:$LINENO: checking if -g produces usable source locations for assembler-with-cpp" >&5
+{ $as_echo "$as_me:$LINENO: checking if -g produces usable source locations for assembler-with-cpp" >&5
-echo $ECHO_N "checking if -g produces usable source locations for assembler-with-cpp... $ECHO_C" >&6; }
+$as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
 if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.S <<EOF
 #include "confdefs.h"
@ -605,7 +587,7 @@ if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } && {
   ac_pattern='conftest\.S'
   { ac_try='readelf --debug-dump=line conftest.o |
@ -613,7 +595,7 @@ if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }
  }; then
  libc_cv_cpp_asm_debuginfo=yes
@ -622,8 +604,8 @@ else
 fi
 rm -f conftest*
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_cpp_asm_debuginfo" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_cpp_asm_debuginfo" >&5
-echo "${ECHO_T}$libc_cv_cpp_asm_debuginfo" >&6; }
+$as_echo "$libc_cv_cpp_asm_debuginfo" >&6; }
 if test $libc_cv_cpp_asm_debuginfo = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_CPP_ASM_DEBUGINFO 1
@ -631,24 +613,24 @@ _ACEOF
 fi
-{ echo "$as_me:$LINENO: checking for SSE4 support" >&5
+{ $as_echo "$as_me:$LINENO: checking for SSE4 support" >&5
-echo $ECHO_N "checking for SSE4 support... $ECHO_C" >&6; }
+$as_echo_n "checking for SSE4 support... " >&6; }
 if test "${libc_cv_cc_sse4+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  if { ac_try='${CC-cc} -msse4 -xc /dev/null -S -o /dev/null'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_cc_sse4=yes
 else
  libc_cv_cc_sse4=no
 fi
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_cc_sse4" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_cc_sse4" >&5
-echo "${ECHO_T}$libc_cv_cc_sse4" >&6; }
+$as_echo "$libc_cv_cc_sse4" >&6; }
 if test $libc_cv_cc_sse4 = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_SSE4_SUPPORT 1
--- a/sysdeps/i386/elf/configure
+++ b/sysdeps/i386/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-{ echo "$as_me:$LINENO: checking for i386 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for i386 TLS support" >&5
-echo $ECHO_N "checking for i386 TLS support... $ECHO_C" >&6; }
+$as_echo_n "checking for i386 TLS support... " >&6; }
 if test "${libc_cv_386_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.section ".tdata", "awT", @progbits
@ -29,7 +29,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_386_tls=yes
 else
@ -37,8 +37,8 @@ else
 fi
 rm -f conftest*
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_386_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_386_tls" >&5
-echo "${ECHO_T}$libc_cv_386_tls" >&6; }
+$as_echo "$libc_cv_386_tls" >&6; }
 if test $libc_cv_386_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/ia64/configure
+++ b/sysdeps/ia64/configure
@ -1,10 +1,10 @@
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
 # Local configure fragment for sysdeps/ia64.
-echo "$as_me:$LINENO: checking if -g produces usable source locations for assembler-with-cpp" >&5
+{ $as_echo "$as_me:$LINENO: checking if -g produces usable source locations for assembler-with-cpp" >&5
-echo $ECHO_N "checking if -g produces usable source locations for assembler-with-cpp... $ECHO_C" >&6
+$as_echo_n "checking if -g produces usable source locations for assembler-with-cpp... " >&6; }
 if test "${libc_cv_cpp_asm_debuginfo+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.S <<EOF
 #include "confdefs.h"
@ -27,7 +27,7 @@ if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } && {
   ac_pattern='conftest\.S'
   { ac_try='readelf --debug-dump=line conftest.o |
@ -35,7 +35,7 @@ if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -g -c conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }
  }; then
  libc_cv_cpp_asm_debuginfo=yes
@ -44,8 +44,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_cpp_asm_debuginfo" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_cpp_asm_debuginfo" >&5
-echo "${ECHO_T}$libc_cv_cpp_asm_debuginfo" >&6
+$as_echo "$libc_cv_cpp_asm_debuginfo" >&6; }
 if test $libc_cv_cpp_asm_debuginfo = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_CPP_ASM_DEBUGINFO 1
--- a/sysdeps/ia64/elf/configure
+++ b/sysdeps/ia64/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for ia64 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for ia64 TLS support" >&5
-echo $ECHO_N "checking for ia64 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for ia64 TLS support... " >&6; }
 if test "${libc_cv_ia64_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
        .section ".tdata","awT",@progbits
@ -27,7 +27,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_ia64_tls=yes
 else
@ -35,8 +35,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_ia64_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_ia64_tls" >&5
-echo "${ECHO_T}$libc_cv_ia64_tls" >&6
+$as_echo "$libc_cv_ia64_tls" >&6; }
 if test $libc_cv_ia64_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/ieee754/ldbl-opt/configure
+++ b/sysdeps/ieee754/ldbl-opt/configure
@ -2,10 +2,10 @@
 # Local configure fragment for sysdeps/ieee754/ldbl-opt/.
-echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mlong-double-128" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mlong-double-128" >&5
-echo $ECHO_N "checking whether $CC $CFLAGS supports -mlong-double-128... $ECHO_C" >&6
+$as_echo_n "checking whether $CC $CFLAGS supports -mlong-double-128... " >&6; }
 if test "${libc_cv_mlong_double_128+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -mlong-double-128"
@ -29,41 +29,38 @@ long double foobar (long double x) { return x; }
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mlong_double_128=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mlong_double_128=no
+	libc_cv_mlong_double_128=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128" >&5
-echo "${ECHO_T}$libc_cv_mlong_double_128" >&6
+$as_echo "$libc_cv_mlong_double_128" >&6; }
 if test "$libc_cv_mlong_double_128" = no; then
-  { { echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 support" >&5
+  { { $as_echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 support" >&5
-echo "$as_me: error: this configuration requires -mlong-double-128 support" >&2;}
+$as_echo "$as_me: error: this configuration requires -mlong-double-128 support" >&2;}
   { (exit 1); exit 1; }; }
 fi
--- a/sysdeps/mach/configure
+++ b/sysdeps/mach/configure
@ -3,10 +3,10 @@
 if test -n "$ac_tool_prefix"; then
  # Extract the first word of "${ac_tool_prefix}mig", so it can be a program name with args.
 set dummy ${ac_tool_prefix}mig; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_MIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  if test -n "$MIG"; then
  ac_cv_prog_MIG="$MIG" # Let the user override the test.
@ -17,34 +17,36 @@ do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    ac_cv_prog_MIG="${ac_tool_prefix}mig"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi
 done
 done
 IFS=$as_save_IFS
 fi
 fi
 MIG=$ac_cv_prog_MIG
 if test -n "$MIG"; then
-  echo "$as_me:$LINENO: result: $MIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $MIG" >&5
-echo "${ECHO_T}$MIG" >&6
+$as_echo "$MIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+$as_echo "no" >&6; }
 fi
 fi
 if test -z "$ac_cv_prog_MIG"; then
  ac_ct_MIG=$MIG
  # Extract the first word of "mig", so it can be a program name with args.
 set dummy mig; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+$as_echo_n "checking for $ac_word... " >&6; }
 if test "${ac_cv_prog_ac_ct_MIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_MIG"; then
  ac_cv_prog_ac_ct_MIG="$ac_ct_MIG" # Let the user override the test.
@ -55,44 +57,54 @@ do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
    ac_cv_prog_ac_ct_MIG="mig"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
    break 2
  fi
 done
 done
 IFS=$as_save_IFS
  test -z "$ac_cv_prog_ac_ct_MIG" && ac_cv_prog_ac_ct_MIG="MISSING"
 fi
 fi
 ac_ct_MIG=$ac_cv_prog_ac_ct_MIG
 if test -n "$ac_ct_MIG"; then
-  echo "$as_me:$LINENO: result: $ac_ct_MIG" >&5
+  { $as_echo "$as_me:$LINENO: result: $ac_ct_MIG" >&5
-echo "${ECHO_T}$ac_ct_MIG" >&6
+$as_echo "$ac_ct_MIG" >&6; }
 else
-  echo "$as_me:$LINENO: result: no" >&5
+  { $as_echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
+$as_echo "no" >&6; }
 fi
-  MIG=$ac_ct_MIG
+  if test "x$ac_ct_MIG" = x; then
    MIG="MISSING"
  else
    case $cross_compiling:$ac_tool_warned in
 yes:)
 { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
    MIG=$ac_ct_MIG
  fi
 else
  MIG="$ac_cv_prog_MIG"
 fi
 if test "x$MIG" = xMISSING; then
-  { { echo "$as_me:$LINENO: error: cannot find required build tool mig" >&5
+  { { $as_echo "$as_me:$LINENO: error: cannot find required build tool mig" >&5
-echo "$as_me: error: cannot find required build tool mig" >&2;}
+$as_echo "$as_me: error: cannot find required build tool mig" >&2;}
   { (exit 1); exit 1; }; }
 fi
 ### Sanity checks for Mach header installation
-echo "$as_me:$LINENO: checking for mach/mach_types.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for mach/mach_types.h" >&5
-echo $ECHO_N "checking for mach/mach_types.h... $ECHO_C" >&6
+$as_echo_n "checking for mach/mach_types.h... " >&6; }
 if test "${ac_cv_header_mach_mach_types_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -102,48 +114,48 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mach/mach_types.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  (exit $ac_status); } >/dev/null && {
-  if test -s conftest.err; then
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-    ac_cpp_err=$ac_c_preproc_warn_flag
+	 test ! -s conftest.err
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+       }; then
  else
    ac_cpp_err=
  fi
 else
  ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
  ac_cv_header_mach_mach_types_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  ac_cv_header_mach_mach_types_h=no
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mach_mach_types_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mach_mach_types_h" >&5
-echo "${ECHO_T}$ac_cv_header_mach_mach_types_h" >&6
+$as_echo "$ac_cv_header_mach_mach_types_h" >&6; }
-if test $ac_cv_header_mach_mach_types_h = yes; then
+if test "x$ac_cv_header_mach_mach_types_h" = x""yes; then
  :
 else
-  { { echo "$as_me:$LINENO: error: cannot find Mach headers" >&5
+  { { $as_echo "$as_me:$LINENO: error: cannot find Mach headers" >&5
-echo "$as_me: error: cannot find Mach headers" >&2;}
+$as_echo "$as_me: error: cannot find Mach headers" >&2;}
   { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: checking for mach/mach_types.defs" >&5
+{ $as_echo "$as_me:$LINENO: checking for mach/mach_types.defs" >&5
-echo $ECHO_N "checking for mach/mach_types.defs... $ECHO_C" >&6
+$as_echo_n "checking for mach/mach_types.defs... " >&6; }
 if test "${ac_cv_header_mach_mach_types_defs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -153,40 +165,40 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mach/mach_types.defs>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  (exit $ac_status); } >/dev/null && {
-  if test -s conftest.err; then
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-    ac_cpp_err=$ac_c_preproc_warn_flag
+	 test ! -s conftest.err
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+       }; then
  else
    ac_cpp_err=
  fi
 else
  ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
  ac_cv_header_mach_mach_types_defs=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  ac_cv_header_mach_mach_types_defs=no
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mach_mach_types_defs" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mach_mach_types_defs" >&5
-echo "${ECHO_T}$ac_cv_header_mach_mach_types_defs" >&6
+$as_echo "$ac_cv_header_mach_mach_types_defs" >&6; }
-if test $ac_cv_header_mach_mach_types_defs = yes; then
+if test "x$ac_cv_header_mach_mach_types_defs" = x""yes; then
  :
 else
-  { { echo "$as_me:$LINENO: error: cannot find Mach .defs files" >&5
+  { { $as_echo "$as_me:$LINENO: error: cannot find Mach .defs files" >&5
-echo "$as_me: error: cannot find Mach .defs files" >&2;}
+$as_echo "$as_me: error: cannot find Mach .defs files" >&2;}
   { (exit 1); exit 1; }; }
 fi
@ -194,10 +206,10 @@ fi
-echo "$as_me:$LINENO: checking for task_t in mach/mach_types.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for task_t in mach/mach_types.h" >&5
-echo $ECHO_N "checking for task_t in mach/mach_types.h... $ECHO_C" >&6
+$as_echo_n "checking for task_t in mach/mach_types.h... " >&6; }
 if test "${libc_cv_mach_task_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -215,45 +227,42 @@ extern task_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mach_task_t=task_t
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mach_task_t=task_port_t
+	libc_cv_mach_task_t=task_port_t
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_task_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_task_t" >&5
-echo "${ECHO_T}$libc_cv_mach_task_t" >&6
+$as_echo "$libc_cv_mach_task_t" >&6; }
 if test $libc_cv_mach_task_t != task_t; then
  DEFINES="$DEFINES -Dtask_t=task_port_t"
 fi
-echo "$as_me:$LINENO: checking for thread_t in mach/mach_types.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for thread_t in mach/mach_types.h" >&5
-echo $ECHO_N "checking for thread_t in mach/mach_types.h... $ECHO_C" >&6
+$as_echo_n "checking for thread_t in mach/mach_types.h... " >&6; }
 if test "${libc_cv_mach_thread_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -271,46 +280,43 @@ extern thread_t foo;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mach_thread_t=thread_t
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mach_thread_t=thread_port_t
+	libc_cv_mach_thread_t=thread_port_t
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_thread_t" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_thread_t" >&5
-echo "${ECHO_T}$libc_cv_mach_thread_t" >&6
+$as_echo "$libc_cv_mach_thread_t" >&6; }
 if test $libc_cv_mach_thread_t != thread_t; then
  DEFINES="$DEFINES -Dthread_t=thread_port_t"
 fi
-echo "$as_me:$LINENO: checking for creation_time in task_basic_info" >&5
+{ $as_echo "$as_me:$LINENO: checking for creation_time in task_basic_info" >&5
-echo $ECHO_N "checking for creation_time in task_basic_info... $ECHO_C" >&6
+$as_echo_n "checking for creation_time in task_basic_info... " >&6; }
 if test "${libc_cv_mach_task_creation_time+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -331,41 +337,38 @@ long s = i->creation_time.seconds;
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mach_task_creation_time=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mach_task_creation_time=no
+	libc_cv_mach_task_creation_time=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_task_creation_time" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_task_creation_time" >&5
-echo "${ECHO_T}$libc_cv_mach_task_creation_time" >&6
+$as_echo "$libc_cv_mach_task_creation_time" >&6; }
 if test $libc_cv_mach_task_creation_time = no; then
-  { { echo "$as_me:$LINENO: error: you need Mach headers supporting task_info.creation_time" >&5
+  { { $as_echo "$as_me:$LINENO: error: you need Mach headers supporting task_info.creation_time" >&5
-echo "$as_me: error: you need Mach headers supporting task_info.creation_time" >&2;}
+$as_echo "$as_me: error: you need Mach headers supporting task_info.creation_time" >&2;}
   { (exit 1); exit 1; }; }
 fi
@ -376,11 +379,11 @@ for ifc in mach mach4 \
 	   memory_object memory_object_default default_pager \
 	   i386/mach_i386 \
 	   ; do
-  as_ac_Header=`echo "ac_cv_header_mach/${ifc}.defs" | $as_tr_sh`
+  as_ac_Header=`$as_echo "ac_cv_header_mach/${ifc}.defs" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for mach/${ifc}.defs" >&5
+{ $as_echo "$as_me:$LINENO: checking for mach/${ifc}.defs" >&5
-echo $ECHO_N "checking for mach/${ifc}.defs... $ECHO_C" >&6
+$as_echo_n "checking for mach/${ifc}.defs... " >&6; }
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
+if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -390,66 +393,189 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mach/${ifc}.defs>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  (exit $ac_status); } >/dev/null && {
-  if test -s conftest.err; then
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-    ac_cpp_err=$ac_c_preproc_warn_flag
+	 test ! -s conftest.err
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+       }; then
  else
    ac_cpp_err=
  fi
 else
  ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
  eval "$as_ac_Header=yes"
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  eval "$as_ac_Header=no"
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ac_res=`eval 'as_val=${'$as_ac_Header'}
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+		 $as_echo "$as_val"'`
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 as_val=`eval 'as_val=${'$as_ac_Header'}
 		 $as_echo "$as_val"'`
   if test "x$as_val" = x""yes; then
    mach_interface_list="$mach_interface_list $ifc"
 fi
 done
 if test "x$mach_interface_list" = x; then
-  { { echo "$as_me:$LINENO: error: what manner of Mach is this?" >&5
+  { { $as_echo "$as_me:$LINENO: error: what manner of Mach is this?" >&5
-echo "$as_me: error: what manner of Mach is this?" >&2;}
+$as_echo "$as_me: error: what manner of Mach is this?" >&2;}
   { (exit 1); exit 1; }; }
 fi
-echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_prog_egrep+set}" = set; then
+if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+  if test -z "$GREP"; then
-    then ac_cv_prog_egrep='grep -E'
+  ac_path_GREP_found=false
-    else ac_cv_prog_egrep='egrep'
+  # Loop through the user's path and test for each of PROGNAME-LIST
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in grep ggrep; do
    for ac_exec_ext in '' $ac_executable_extensions; do
      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
 # Check for GNU ac_path_GREP and select it if it is found.
  # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
  ac_count=0
  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
    $as_echo 'GREP' >> "conftest.nl"
    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
    if test $ac_count -gt ${ac_path_GREP_max-0}; then
      # Best one so far, save it but keep looking for a better one
      ac_cv_path_GREP="$ac_path_GREP"
      ac_path_GREP_max=$ac_count
    fi
    # 10*(2^10) chars as input seems more than enough
    test $ac_count -gt 10 && break
  done
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
      $ac_path_GREP_found && break 3
    done
  done
 done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_GREP"; then
    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 $as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
  fi
 else
  ac_cv_path_GREP=$GREP
 fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
+
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
+fi
- EGREP=$ac_cv_prog_egrep
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
 $as_echo "$ac_cv_path_GREP" >&6; }
 GREP="$ac_cv_path_GREP"
-echo "$as_me:$LINENO: checking for host_page_size in mach_host.defs" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for host_page_size in mach_host.defs... $ECHO_C" >&6
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
  $as_echo_n "(cached) " >&6
 else
  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   then ac_cv_path_EGREP="$GREP -E"
   else
     if test -z "$EGREP"; then
  ac_path_EGREP_found=false
  # Loop through the user's path and test for each of PROGNAME-LIST
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in egrep; do
    for ac_exec_ext in '' $ac_executable_extensions; do
      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
  # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
  ac_count=0
  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
    $as_echo 'EGREP' >> "conftest.nl"
    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
    if test $ac_count -gt ${ac_path_EGREP_max-0}; then
      # Best one so far, save it but keep looking for a better one
      ac_cv_path_EGREP="$ac_path_EGREP"
      ac_path_EGREP_max=$ac_count
    fi
    # 10*(2^10) chars as input seems more than enough
    test $ac_count -gt 10 && break
  done
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
      $ac_path_EGREP_found && break 3
    done
  done
 done
 IFS=$as_save_IFS
  if test -z "$ac_cv_path_EGREP"; then
    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 $as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
  fi
 else
  ac_cv_path_EGREP=$EGREP
 fi
   fi
 fi
 { $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
 $as_echo "$ac_cv_path_EGREP" >&6; }
 EGREP="$ac_cv_path_EGREP"
 { $as_echo "$as_me:$LINENO: checking for host_page_size in mach_host.defs" >&5
 $as_echo_n "checking for host_page_size in mach_host.defs... " >&6; }
 if test "${libc_cv_mach_host_page_size+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -469,8 +595,8 @@ fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_host_page_size" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_host_page_size" >&5
-echo "${ECHO_T}$libc_cv_mach_host_page_size" >&6
+$as_echo "$libc_cv_mach_host_page_size" >&6; }
 if test $libc_cv_mach_host_page_size = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_HOST_PAGE_SIZE 1
@ -478,10 +604,10 @@ _ACEOF
 fi
-echo "$as_me:$LINENO: checking for mach/machine/ndr_def.h" >&5
+{ $as_echo "$as_me:$LINENO: checking for mach/machine/ndr_def.h" >&5
-echo $ECHO_N "checking for mach/machine/ndr_def.h... $ECHO_C" >&6
+$as_echo_n "checking for mach/machine/ndr_def.h... " >&6; }
 if test "${ac_cv_header_mach_machine_ndr_def_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -491,42 +617,42 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <mach/machine/ndr_def.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  (exit $ac_status); } >/dev/null && {
-  if test -s conftest.err; then
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-    ac_cpp_err=$ac_c_preproc_warn_flag
+	 test ! -s conftest.err
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+       }; then
  else
    ac_cpp_err=
  fi
 else
  ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
  ac_cv_header_mach_machine_ndr_def_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  ac_cv_header_mach_machine_ndr_def_h=no
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_mach_machine_ndr_def_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_mach_machine_ndr_def_h" >&5
-echo "${ECHO_T}$ac_cv_header_mach_machine_ndr_def_h" >&6
+$as_echo "$ac_cv_header_mach_machine_ndr_def_h" >&6; }
-if test $ac_cv_header_mach_machine_ndr_def_h = yes; then
+if test "x$ac_cv_header_mach_machine_ndr_def_h" = x""yes; then
    DEFINES="$DEFINES -DNDR_DEF_HEADER='<mach/machine/ndr_def.h>'"
 else
-  echo "$as_me:$LINENO: checking for machine/ndr_def.h" >&5
+  { $as_echo "$as_me:$LINENO: checking for machine/ndr_def.h" >&5
-echo $ECHO_N "checking for machine/ndr_def.h... $ECHO_C" >&6
+$as_echo_n "checking for machine/ndr_def.h... " >&6; }
 if test "${ac_cv_header_machine_ndr_def_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -536,36 +662,36 @@ cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <machine/ndr_def.h>
 _ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (ac_try="$ac_cpp conftest.$ac_ext"
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
+  (exit $ac_status); } >/dev/null && {
-  if test -s conftest.err; then
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
-    ac_cpp_err=$ac_c_preproc_warn_flag
+	 test ! -s conftest.err
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+       }; then
  else
    ac_cpp_err=
  fi
 else
  ac_cpp_err=yes
 fi
 if test -z "$ac_cpp_err"; then
  ac_cv_header_machine_ndr_def_h=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
  ac_cv_header_machine_ndr_def_h=no
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $ac_cv_header_machine_ndr_def_h" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_machine_ndr_def_h" >&5
-echo "${ECHO_T}$ac_cv_header_machine_ndr_def_h" >&6
+$as_echo "$ac_cv_header_machine_ndr_def_h" >&6; }
-if test $ac_cv_header_machine_ndr_def_h = yes; then
+if test "x$ac_cv_header_machine_ndr_def_h" = x""yes; then
    DEFINES="$DEFINES -DNDR_DEF_HEADER='<machine/ndr_def.h>'"
 fi
@ -574,10 +700,10 @@ fi
-echo "$as_me:$LINENO: checking for i386_io_perm_modify in mach_i386.defs" >&5
+{ $as_echo "$as_me:$LINENO: checking for i386_io_perm_modify in mach_i386.defs" >&5
-echo $ECHO_N "checking for i386_io_perm_modify in mach_i386.defs... $ECHO_C" >&6
+$as_echo_n "checking for i386_io_perm_modify in mach_i386.defs... " >&6; }
 if test "${libc_cv_mach_i386_ioports+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -597,8 +723,8 @@ fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_i386_ioports" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_i386_ioports" >&5
-echo "${ECHO_T}$libc_cv_mach_i386_ioports" >&6
+$as_echo "$libc_cv_mach_i386_ioports" >&6; }
 if test $libc_cv_mach_i386_ioports = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_I386_IO_PERM_MODIFY 1
@ -606,10 +732,10 @@ _ACEOF
 fi
-echo "$as_me:$LINENO: checking for i386_set_gdt in mach_i386.defs" >&5
+{ $as_echo "$as_me:$LINENO: checking for i386_set_gdt in mach_i386.defs" >&5
-echo $ECHO_N "checking for i386_set_gdt in mach_i386.defs... $ECHO_C" >&6
+$as_echo_n "checking for i386_set_gdt in mach_i386.defs... " >&6; }
 if test "${libc_cv_mach_i386_gdt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -629,8 +755,8 @@ fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mach_i386_gdt" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mach_i386_gdt" >&5
-echo "${ECHO_T}$libc_cv_mach_i386_gdt" >&6
+$as_echo "$libc_cv_mach_i386_gdt" >&6; }
 if test $libc_cv_mach_i386_gdt = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_I386_SET_GDT 1
@ -641,10 +767,10 @@ fi
 # See if mig groks `retcode'.
-echo "$as_me:$LINENO: checking whether $MIG supports the retcode keyword" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $MIG supports the retcode keyword" >&5
-echo $ECHO_N "checking whether $MIG supports the retcode keyword... $ECHO_C" >&6
+$as_echo_n "checking whether $MIG supports the retcode keyword... " >&6; }
 if test "${hurd_cv_mig_retcode+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.defs <<\EOF
 #include <mach/std_types.defs>
@ -660,7 +786,7 @@ if { ac_try='CC="${CC}" ${MIG-false} -n conftest.defs 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  hurd_cv_mig_retcode=yes
 else
@ -668,8 +794,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $hurd_cv_mig_retcode" >&5
+{ $as_echo "$as_me:$LINENO: result: $hurd_cv_mig_retcode" >&5
-echo "${ECHO_T}$hurd_cv_mig_retcode" >&6
+$as_echo "$hurd_cv_mig_retcode" >&6; }
 if test $hurd_cv_mig_retcode = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_MIG_RETCODE 1
--- a/sysdeps/mach/hurd/configure
+++ b/sysdeps/mach/hurd/configure
@ -13,8 +13,8 @@ _ACEOF
 inhibit_glue=yes
 if test "x$prefix" != x; then
-  { echo "$as_me:$LINENO: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&5
+  { $as_echo "$as_me:$LINENO: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&5
-echo "$as_me: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&2;}
+$as_echo "$as_me: WARNING: --prefix= (empty) is required for GNU/Hurd to work normally" >&2;}
 fi
 case "$machine" in
@ -28,10 +28,10 @@ case "$machine" in
 esac
-echo "$as_me:$LINENO: checking Hurd header version" >&5
+{ $as_echo "$as_me:$LINENO: checking Hurd header version" >&5
-echo $ECHO_N "checking Hurd header version... $ECHO_C" >&6
+$as_echo_n "checking Hurd header version... " >&6; }
 if test "${libc_cv_hurd_version+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -53,40 +53,37 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_hurd_version=ok
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_hurd_version=bad
+	libc_cv_hurd_version=bad
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:$LINENO: result: $libc_cv_hurd_version" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_hurd_version" >&5
-echo "${ECHO_T}$libc_cv_hurd_version" >&6
+$as_echo "$libc_cv_hurd_version" >&6; }
 if test "x$libc_cv_hurd_version" != xok; then
-  { { echo "$as_me:$LINENO: error: Hurd headers not installed or too old" >&5
+  { { $as_echo "$as_me:$LINENO: error: Hurd headers not installed or too old" >&5
-echo "$as_me: error: Hurd headers not installed or too old" >&2;}
+$as_echo "$as_me: error: Hurd headers not installed or too old" >&2;}
   { (exit 1); exit 1; }; }
 fi
--- a/sysdeps/powerpc/configure
+++ b/sysdeps/powerpc/configure
@ -2,10 +2,10 @@
 # Local configure fragment for sysdeps/powerpc.
 # Accept binutils which knows about ".machine".
-echo "$as_me:$LINENO: checking for .machine support" >&5
+{ $as_echo "$as_me:$LINENO: checking for .machine support" >&5
-echo $ECHO_N "checking for .machine support... $ECHO_C" >&6
+$as_echo_n "checking for .machine support... " >&6; }
 if test "${libc_cv_ppc_machine+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.machine "altivec"
@ -15,7 +15,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_ppc_machine=yes
 else
@ -23,14 +23,14 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_ppc_machine" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_ppc_machine" >&5
-echo "${ECHO_T}$libc_cv_ppc_machine" >&6
+$as_echo "$libc_cv_ppc_machine" >&6; }
 if test $libc_cv_ppc_machine != yes; then
-  { { echo "$as_me:$LINENO: error:
+  { { $as_echo "$as_me:$LINENO: error:
 *** A binutils version which can handle
 ***    .machine \"altivec\"
 *** is needed." >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
 *** A binutils version which can handle
 ***    .machine \"altivec\"
 *** is needed." >&2;}
--- a/sysdeps/powerpc/powerpc32/configure
+++ b/sysdeps/powerpc/powerpc32/configure
@ -2,10 +2,10 @@
 # Local configure fragment for sysdeps/powerpc/powerpc32.
 # See whether gas has R_PPC_REL16 relocs.
-echo "$as_me:$LINENO: checking for R_PPC_REL16 gas support" >&5
+{ $as_echo "$as_me:$LINENO: checking for R_PPC_REL16 gas support" >&5
-echo $ECHO_N "checking for R_PPC_REL16 gas support... $ECHO_C" >&6
+$as_echo_n "checking for R_PPC_REL16 gas support... " >&6; }
 if test "${libc_cv_ppc_rel16+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.text
@ -15,7 +15,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_ppc_rel16=yes
 else
@ -23,8 +23,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_ppc_rel16" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_ppc_rel16" >&5
-echo "${ECHO_T}$libc_cv_ppc_rel16" >&6
+$as_echo "$libc_cv_ppc_rel16" >&6; }
 if test $libc_cv_ppc_rel16 = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_ASM_PPC_REL16 1
@ -33,10 +33,10 @@ _ACEOF
 fi
 # See whether GCC uses -msecure-plt.
-echo "$as_me:$LINENO: checking for -msecure-plt by default" >&5
+{ $as_echo "$as_me:$LINENO: checking for -msecure-plt by default" >&5
-echo $ECHO_N "checking for -msecure-plt by default... $ECHO_C" >&6
+$as_echo_n "checking for -msecure-plt by default... " >&6; }
 if test "${libc_cv_ppc_secure_plt+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  echo 'int foo (void) { extern int bar; return bar; }' > conftest.c
 libc_cv_ppc_secure_plt=no
@ -44,7 +44,7 @@ if { ac_try='${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  if grep '_GLOBAL_OFFSET_TABLE_-.*@ha' conftest.s > /dev/null 2>&1; then
    libc_cv_ppc_secure_plt=yes
@ -52,8 +52,8 @@ if { ac_try='${CC-cc} -S $CFLAGS conftest.c -fpic -o conftest.s 1>&5'
 fi
 rm -rf conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_ppc_secure_plt" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_ppc_secure_plt" >&5
-echo "${ECHO_T}$libc_cv_ppc_secure_plt" >&6
+$as_echo "$libc_cv_ppc_secure_plt" >&6; }
 if test $libc_cv_ppc_secure_plt = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_PPC_SECURE_PLT 1
--- a/sysdeps/powerpc/powerpc32/elf/configure
+++ b/sysdeps/powerpc/powerpc32/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for powerpc32 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for powerpc32 TLS support" >&5
-echo $ECHO_N "checking for powerpc32 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for powerpc32 TLS support... " >&6; }
 if test "${libc_cv_powerpc32_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.section ".tdata","awT",@progbits
@ -33,7 +33,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_powerpc32_tls=yes
 else
@ -41,8 +41,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_powerpc32_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_powerpc32_tls" >&5
-echo "${ECHO_T}$libc_cv_powerpc32_tls" >&6
+$as_echo "$libc_cv_powerpc32_tls" >&6; }
 if test $libc_cv_powerpc32_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/powerpc/powerpc64/configure
+++ b/sysdeps/powerpc/powerpc64/configure
@ -3,10 +3,10 @@
 # The Aix ld uses global .symbol_names instead of symbol_names
 # and unfortunately early Linux PPC64 linkers use it as well.
-echo "$as_me:$LINENO: checking for support for omitting dot symbols" >&5
+{ $as_echo "$as_me:$LINENO: checking for support for omitting dot symbols" >&5
-echo $ECHO_N "checking for support for omitting dot symbols... $ECHO_C" >&6
+$as_echo_n "checking for support for omitting dot symbols... " >&6; }
 if test "${libc_cv_omit_dot_syms+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  libc_cv_omit_dot_syms=no
 echo 'void foo (void) {}' > conftest.c
@ -14,7 +14,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c -o conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  if grep -w '\.foo' conftest.s > /dev/null; then
    :
@ -25,8 +25,8 @@ fi
 rm -f conftest.c conftest.s
 fi
-echo "$as_me:$LINENO: result: $libc_cv_omit_dot_syms" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_omit_dot_syms" >&5
-echo "${ECHO_T}$libc_cv_omit_dot_syms" >&6
+$as_echo "$libc_cv_omit_dot_syms" >&6; }
 if test x$libc_cv_omit_dot_syms != xyes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_ASM_GLOBAL_DOT_NAME 1
@ -34,10 +34,10 @@ _ACEOF
 fi
-echo "$as_me:$LINENO: checking for linker support for overlapping .opd entries" >&5
+{ $as_echo "$as_me:$LINENO: checking for linker support for overlapping .opd entries" >&5
-echo $ECHO_N "checking for linker support for overlapping .opd entries... $ECHO_C" >&6
+$as_echo_n "checking for linker support for overlapping .opd entries... " >&6; }
 if test "${libc_cv_overlapping_opd+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  libc_cv_overlapping_opd=no
 echo 'void foo (void) {}' > conftest.c
@ -45,7 +45,7 @@ if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -S conftest.c -o conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  if grep '\.TOC\.@tocbase' conftest.s > /dev/null; then
    if grep '\.TOC\.@tocbase[ 	]*,[ 	]*0' conftest.s > /dev/null; then
@ -58,8 +58,8 @@ fi
 rm -f conftest.c conftest.s
 fi
-echo "$as_me:$LINENO: result: $libc_cv_overlapping_opd" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_overlapping_opd" >&5
-echo "${ECHO_T}$libc_cv_overlapping_opd" >&6
+$as_echo "$libc_cv_overlapping_opd" >&6; }
 if test x$libc_cv_overlapping_opd = xyes; then
  cat >>confdefs.h <<\_ACEOF
 #define USE_PPC64_OVERLAPPING_OPD 1
--- a/sysdeps/powerpc/powerpc64/elf/configure
+++ b/sysdeps/powerpc/powerpc64/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for powerpc64 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for powerpc64 TLS support" >&5
-echo $ECHO_N "checking for powerpc64 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for powerpc64 TLS support... " >&6; }
 if test "${libc_cv_powerpc64_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
        .section ".tdata","awT",@progbits
@ -52,7 +52,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_powerpc64_tls=yes
 else
@ -60,8 +60,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_powerpc64_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_powerpc64_tls" >&5
-echo "${ECHO_T}$libc_cv_powerpc64_tls" >&6
+$as_echo "$libc_cv_powerpc64_tls" >&6; }
 if test $libc_cv_powerpc64_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/s390/s390-32/elf/configure
+++ b/sysdeps/s390/s390-32/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for s390 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for s390 TLS support" >&5
-echo $ECHO_N "checking for s390 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for s390 TLS support... " >&6; }
 if test "${libc_cv_390_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.S <<\EOF
 	.section ".tdata", "awT", @progbits
@ -28,7 +28,7 @@ if { ac_try='${CC-cc} -S $CFLAGS conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_390_tls=yes
 else
@ -36,8 +36,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_390_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_390_tls" >&5
-echo "${ECHO_T}$libc_cv_390_tls" >&6
+$as_echo "$libc_cv_390_tls" >&6; }
 if test $libc_cv_390_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/s390/s390-64/elf/configure
+++ b/sysdeps/s390/s390-64/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for s390 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for s390 TLS support" >&5
-echo $ECHO_N "checking for s390 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for s390 TLS support... " >&6; }
 if test "${libc_cv_390_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.S <<\EOF
 	.section ".tdata", "awT", @progbits
@ -28,7 +28,7 @@ if { ac_try='${CC-cc} -S $CFLAGS conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_390_tls=yes
 else
@ -36,8 +36,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_390_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_390_tls" >&5
-echo "${ECHO_T}$libc_cv_390_tls" >&6
+$as_echo "$libc_cv_390_tls" >&6; }
 if test $libc_cv_390_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/sh/elf/configure
+++ b/sysdeps/sh/elf/configure
@ -4,10 +4,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and
 # linker.
-echo "$as_me:$LINENO: checking for SH TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for SH TLS support" >&5
-echo $ECHO_N "checking for SH TLS support... $ECHO_C" >&6
+$as_echo_n "checking for SH TLS support... " >&6; }
 if test "${libc_cv_sh_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.S <<\EOF
 	.section ".tdata", "awT", @progbits
@ -23,7 +23,7 @@ if { ac_try='${CC-cc} -S $CFLAGS conftest.S 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_sh_tls=yes
 else
@ -31,8 +31,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_sh_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_sh_tls" >&5
-echo "${ECHO_T}$libc_cv_sh_tls" >&6
+$as_echo "$libc_cv_sh_tls" >&6; }
 if test $libc_cv_sh_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
--- a/sysdeps/sparc/sparc32/elf/configure
+++ b/sysdeps/sparc/sparc32/elf/configure
@ -3,10 +3,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and linker.
-echo "$as_me:$LINENO: checking for sparc32 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for sparc32 TLS support" >&5
-echo $ECHO_N "checking for sparc32 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for sparc32 TLS support... " >&6; }
 if test "${libc_cv_sparc32_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.section ".tdata", "awT", @progbits
@ -38,7 +38,7 @@ if { ac_try='${CC-cc} -c $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_sparc32_tls=yes
 else
@ -46,8 +46,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_sparc32_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_sparc32_tls" >&5
-echo "${ECHO_T}$libc_cv_sparc32_tls" >&6
+$as_echo "$libc_cv_sparc32_tls" >&6; }
 if test $libc_cv_sparc32_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
@ -57,10 +57,10 @@ fi
 fi
 # Check for broken WDISP22 in the linker.
-echo "$as_me:$LINENO: checking for sparc32 ld WDISP22 handling" >&5
+{ $as_echo "$as_me:$LINENO: checking for sparc32 ld WDISP22 handling" >&5
-echo $ECHO_N "checking for sparc32 ld WDISP22 handling... $ECHO_C" >&6
+$as_echo_n "checking for sparc32 ld WDISP22 handling... " >&6; }
 if test "${libc_cv_sparc32_wdisp22+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  echo 'bne foo; nop' > conftest1.s
 echo '.globl foo; .hidden foo; foo: nop' > conftest2.s
@ -69,7 +69,7 @@ if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conft
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then
    libc_cv_sparc32_wdisp22=broken
@ -79,8 +79,8 @@ if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conft
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_sparc32_wdisp22" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_sparc32_wdisp22" >&5
-echo "${ECHO_T}$libc_cv_sparc32_wdisp22" >&6
+$as_echo "$libc_cv_sparc32_wdisp22" >&6; }
 if test $libc_cv_sparc32_wdisp22 != ok; then
  cat >>confdefs.h <<\_ACEOF
 #define BROKEN_SPARC_WDISP22 1
--- a/sysdeps/sparc/sparc64/elf/configure
+++ b/sysdeps/sparc/sparc64/elf/configure
@ -3,10 +3,10 @@
 if test "$usetls" != no; then
 # Check for support of thread-local storage handling in assembler and linker.
-echo "$as_me:$LINENO: checking for sparc64 TLS support" >&5
+{ $as_echo "$as_me:$LINENO: checking for sparc64 TLS support" >&5
-echo $ECHO_N "checking for sparc64 TLS support... $ECHO_C" >&6
+$as_echo_n "checking for sparc64 TLS support... " >&6; }
 if test "${libc_cv_sparc64_tls+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat > conftest.s <<\EOF
 	.section ".tdata", "awT", @progbits
@ -39,7 +39,7 @@ if { ac_try='${CC-cc} -o conftest.bin $CFLAGS conftest.s 1>&5'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_sparc64_tls=yes
 else
@ -47,8 +47,8 @@ else
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_sparc64_tls" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_sparc64_tls" >&5
-echo "${ECHO_T}$libc_cv_sparc64_tls" >&6
+$as_echo "$libc_cv_sparc64_tls" >&6; }
 if test $libc_cv_sparc64_tls = yes; then
  cat >>confdefs.h <<\_ACEOF
 #define HAVE_TLS_SUPPORT 1
@ -58,10 +58,10 @@ fi
 fi
 # Check for broken WDISP22 in the linker.
-echo "$as_me:$LINENO: checking for sparc64 ld WDISP22 handling" >&5
+{ $as_echo "$as_me:$LINENO: checking for sparc64 ld WDISP22 handling" >&5
-echo $ECHO_N "checking for sparc64 ld WDISP22 handling... $ECHO_C" >&6
+$as_echo_n "checking for sparc64 ld WDISP22 handling... " >&6; }
 if test "${libc_cv_sparc64_wdisp22+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  echo 'bne foo; nop' > conftest1.s
 echo '.globl foo; .hidden foo; foo: nop' > conftest2.s
@ -70,7 +70,7 @@ if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conft
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  if readelf -r conftest.so | grep -q R_SPARC_WDISP22; then
    libc_cv_sparc64_wdisp22=broken
@ -80,8 +80,8 @@ if { ac_try='${CC-cc} -nostdlib -shared $CFLAGS conftest1.s conftest2.s -o conft
 fi
 rm -f conftest*
 fi
-echo "$as_me:$LINENO: result: $libc_cv_sparc64_wdisp22" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_sparc64_wdisp22" >&5
-echo "${ECHO_T}$libc_cv_sparc64_wdisp22" >&6
+$as_echo "$libc_cv_sparc64_wdisp22" >&6; }
 if test $libc_cv_sparc64_wdisp22 != ok; then
  cat >>confdefs.h <<\_ACEOF
 #define BROKEN_SPARC_WDISP22 1
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@ -11,42 +11,37 @@ if test -n "$sysheaders"; then
 fi
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
 if test "${ac_cv_path_GREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  # Extract the first word of "grep ggrep" to use in msg output
 if test -z "$GREP"; then
 set dummy grep ggrep; ac_prog_name=$2
 if test "${ac_cv_path_GREP+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  if test -z "$GREP"; then
  ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
+  # Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in grep ggrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-    # Check for GNU ac_path_GREP and select it if it is found.
+# Check for GNU ac_path_GREP and select it if it is found.
  # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
 *)
  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
-    echo 'GREP' >> "conftest.nl"
+    $as_echo 'GREP' >> "conftest.nl"
    "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
@ -61,74 +56,60 @@ case `"$ac_path_GREP" --version 2>&1` in
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-
+      $ac_path_GREP_found && break 3
-    $ac_path_GREP_found && break 3
+    done
  done
 done
 done
 IFS=$as_save_IFS
-
+  if test -z "$ac_cv_path_GREP"; then
-
+    { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-fi
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 GREP="$ac_cv_path_GREP"
 if test -z "$GREP"; then
  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
-fi
+  fi
 else
  ac_cv_path_GREP=$GREP
 fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+$as_echo "$ac_cv_path_GREP" >&6; }
 GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+$as_echo_n "checking for egrep... " >&6; }
 if test "${ac_cv_path_EGREP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
   then ac_cv_path_EGREP="$GREP -E"
   else
-     # Extract the first word of "egrep" to use in msg output
+     if test -z "$EGREP"; then
 if test -z "$EGREP"; then
 set dummy egrep; ac_prog_name=$2
 if test "${ac_cv_path_EGREP+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
 else
  ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
+  # Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
 do
  IFS=$as_save_IFS
  test -z "$as_dir" && as_dir=.
  for ac_prog in egrep; do
-  for ac_exec_ext in '' $ac_executable_extensions; do
+    for ac_exec_ext in '' $ac_executable_extensions; do
-    ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+      ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-    # Check for GNU ac_path_EGREP and select it if it is found.
+# Check for GNU ac_path_EGREP and select it if it is found.
  # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
 *GNU*)
  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
 *)
  ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+  $as_echo_n 0123456789 >"conftest.in"
  while :
  do
    cat "conftest.in" "conftest.in" >"conftest.tmp"
    mv "conftest.tmp" "conftest.in"
    cp "conftest.in" "conftest.nl"
-    echo 'EGREP' >> "conftest.nl"
+    $as_echo 'EGREP' >> "conftest.nl"
    "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
    diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
    ac_count=`expr $ac_count + 1`
@ -143,40 +124,31 @@ case `"$ac_path_EGREP" --version 2>&1` in
  rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
 esac
-
+      $ac_path_EGREP_found && break 3
-    $ac_path_EGREP_found && break 3
+    done
  done
 done
 done
 IFS=$as_save_IFS
-
+  if test -z "$ac_cv_path_EGREP"; then
-
+    { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-fi
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
 EGREP="$ac_cv_path_EGREP"
 if test -z "$EGREP"; then
  { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
 echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
   { (exit 1); exit 1; }; }
-fi
+  fi
 else
  ac_cv_path_EGREP=$EGREP
 fi
   fi
 fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+$as_echo "$ac_cv_path_EGREP" >&6; }
 EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking installed Linux kernel header files" >&5
+{ $as_echo "$as_me:$LINENO: checking installed Linux kernel header files" >&5
-echo $ECHO_N "checking installed Linux kernel header files... $ECHO_C" >&6; }
+$as_echo_n "checking installed Linux kernel header files... " >&6; }
 if test "${libc_cv_linux2010+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@ -198,10 +170,10 @@ fi
 rm -f conftest*
 fi
-{ echo "$as_me:$LINENO: result: $libc_cv_linux2010" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_linux2010" >&5
-echo "${ECHO_T}$libc_cv_linux2010" >&6; }
+$as_echo "$libc_cv_linux2010" >&6; }
 if test "$libc_cv_linux2010" != '2.0.10 or later'; then
-  { { echo "$as_me:$LINENO: error: GNU libc requires kernel header files from
+  { { $as_echo "$as_me:$LINENO: error: GNU libc requires kernel header files from
 Linux 2.0.10 or later to be installed before configuring.
 The kernel header files are found usually in /usr/include/asm and
 /usr/include/linux; make sure these directories use files from
@ -209,7 +181,7 @@ Linux 2.0.10 or later.  This check uses <linux/version.h>, so
 make sure that file was built correctly when installing the kernel header
 files.  To use kernel headers not from /usr/include/linux, use the
 configure option --with-headers." >&5
-echo "$as_me: error: GNU libc requires kernel header files from
+$as_echo "$as_me: error: GNU libc requires kernel header files from
 Linux 2.0.10 or later to be installed before configuring.
 The kernel header files are found usually in /usr/include/asm and
 /usr/include/linux; make sure these directories use files from
@ -291,8 +263,8 @@ if test -n "$minimum_kernel"; then
  arch_version=$((`echo "$arch_minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1 \* 65536 + \2 \* 256 + \3/'`))
  if test $user_version -lt $arch_version; then
-    { echo "$as_me:$LINENO: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
+    { $as_echo "$as_me:$LINENO: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&5
-echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
+$as_echo "$as_me: WARNING: minimum kernel version reset to $arch_minimum_kernel" >&2;}
    minimum_kernel=$arch_minimum_kernel
  fi
 else
@ -302,8 +274,8 @@ else
 fi
 if test -n "$minimum_kernel"; then
-  { echo "$as_me:$LINENO: checking for kernel header at least $minimum_kernel" >&5
+  { $as_echo "$as_me:$LINENO: checking for kernel header at least $minimum_kernel" >&5
-echo $ECHO_N "checking for kernel header at least $minimum_kernel... $ECHO_C" >&6; }
+$as_echo_n "checking for kernel header at least $minimum_kernel... " >&6; }
  decnum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/(\1 * 65536 + \2 * 256 + \3)/'`;
  abinum=`echo "$minimum_kernel.0.0.0" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\1,\2,\3/'`;
  cat >conftest.$ac_ext <<_ACEOF
@ -325,8 +297,8 @@ else
 fi
 rm -f conftest*
-  { echo "$as_me:$LINENO: result: $libc_minimum_kernel" >&5
+  { $as_echo "$as_me:$LINENO: result: $libc_minimum_kernel" >&5
-echo "${ECHO_T}$libc_minimum_kernel" >&6; }
+$as_echo "$libc_minimum_kernel" >&6; }
  if test "$libc_minimum_kernel" = ok; then
    cat >>confdefs.h <<_ACEOF
 #define __LINUX_KERNEL_VERSION $decnum
@ -337,9 +309,9 @@ _ACEOF
 _ACEOF
  else
-    { { echo "$as_me:$LINENO: error: *** The available kernel headers are older than the requested
+    { { $as_echo "$as_me:$LINENO: error: *** The available kernel headers are older than the requested
 *** compatible kernel version" >&5
-echo "$as_me: error: *** The available kernel headers are older than the requested
+$as_echo "$as_me: error: *** The available kernel headers are older than the requested
 *** compatible kernel version" >&2;}
   { (exit 1); exit 1; }; }
  fi
@ -469,8 +441,8 @@ if test $host = $build; then
  else
    ac_prefix=$ac_default_prefix
  fi
-  { echo "$as_me:$LINENO: checking for symlinks in ${ac_prefix}/include" >&5
+  { $as_echo "$as_me:$LINENO: checking for symlinks in ${ac_prefix}/include" >&5
-echo $ECHO_N "checking for symlinks in ${ac_prefix}/include... $ECHO_C" >&6; }
+$as_echo_n "checking for symlinks in ${ac_prefix}/include... " >&6; }
  ac_message=
  if test -L ${ac_prefix}/include/net; then
    ac_message="$ac_message
@ -481,18 +453,18 @@ echo $ECHO_N "checking for symlinks in ${ac_prefix}/include... $ECHO_C" >&6; }
   ${ac_prefix}/include/scsi is a symlink"
  fi
  if test -n "$ac_message"; then
-    { { echo "$as_me:$LINENO: error: $ac_message
+    { { $as_echo "$as_me:$LINENO: error: $ac_message
 \`make install' will destroy the target of the link(s).
 Delete the links and re-run configure, or better still, move the entire
 ${ac_prefix}/include directory out of the way." >&5
-echo "$as_me: error: $ac_message
+$as_echo "$as_me: error: $ac_message
 \`make install' will destroy the target of the link(s).
 Delete the links and re-run configure, or better still, move the entire
 ${ac_prefix}/include directory out of the way." >&2;}
   { (exit 1); exit 1; }; }
  else
-    { echo "$as_me:$LINENO: result: ok" >&5
+    { $as_echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
+$as_echo "ok" >&6; }
  fi
 fi
--- a/sysdeps/unix/sysv/linux/powerpc/configure
+++ b/sysdeps/unix/sysv/linux/powerpc/configure
@ -2,10 +2,10 @@
 # Local configure fragment for sysdeps/unix/sysv/linux/powerpc/.
-echo "$as_me:$LINENO: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5
+{ $as_echo "$as_me:$LINENO: checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format" >&5
-echo $ECHO_N "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... $ECHO_C" >&6
+$as_echo_n "checking whether $CC $CFLAGS -mlong-double-128 uses IBM extended format... " >&6; }
 if test "${libc_cv_mlong_double_128ibm+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
  save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -mlong-double-128"
@ -29,45 +29,42 @@ long double foobar (long double x) { return x; }
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mlong_double_128ibm=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mlong_double_128ibm=no
+	libc_cv_mlong_double_128ibm=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128ibm" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mlong_double_128ibm" >&5
-echo "${ECHO_T}$libc_cv_mlong_double_128ibm" >&6
+$as_echo "$libc_cv_mlong_double_128ibm" >&6; }
 if test "$libc_cv_mlong_double_128ibm" = no; then
-  echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5
+  { $as_echo "$as_me:$LINENO: checking whether $CC $CFLAGS supports -mabi=ibmlongdouble" >&5
-echo $ECHO_N "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... $ECHO_C" >&6
+$as_echo_n "checking whether $CC $CFLAGS supports -mabi=ibmlongdouble... " >&6; }
 if test "${libc_cv_mabi_ibmlongdouble+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+  $as_echo_n "(cached) " >&6
 else
    save_CFLAGS="$CFLAGS"
  CFLAGS="$CFLAGS -mlong-double-128 -mabi=ibmlongdouble"
@ -91,45 +88,42 @@ long double foobar (long double x) { return x; }
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+if { (ac_try="$ac_compile"
-  (eval $ac_compile) 2>conftest.er1
+case "(($ac_try" in
  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
  *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
 $as_echo "$ac_try_echo") >&5
  (eval "$ac_compile") 2>conftest.er1
  ac_status=$?
  grep -v '^ *+' conftest.er1 >conftest.err
  rm -f conftest.er1
  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
+  (exit $ac_status); } && {
-	 { ac_try='test -z "$ac_c_werror_flag"
+	 test -z "$ac_c_werror_flag" ||
-			 || test ! -s conftest.err'
+	 test ! -s conftest.err
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+       } && test -s conftest.$ac_objext; then
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; } &&
 	 { ac_try='test -s conftest.$ac_objext'
  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
  (eval $ac_try) 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; }; then
  libc_cv_mabi_ibmlongdouble=yes
 else
-  echo "$as_me: failed program was:" >&5
+  $as_echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
-libc_cv_mabi_ibmlongdouble=no
+	libc_cv_mabi_ibmlongdouble=no
 fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  CFLAGS="$save_CFLAGS"
 fi
-echo "$as_me:$LINENO: result: $libc_cv_mabi_ibmlongdouble" >&5
+{ $as_echo "$as_me:$LINENO: result: $libc_cv_mabi_ibmlongdouble" >&5
-echo "${ECHO_T}$libc_cv_mabi_ibmlongdouble" >&6
+$as_echo "$libc_cv_mabi_ibmlongdouble" >&6; }
  if test "$libc_cv_mabi_ibmlongdouble" = yes; then
    CFLAGS="$CFLAGS -mabi=ibmlongdouble"
  else
-    { { echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 IBM extended format support" >&5
+    { { $as_echo "$as_me:$LINENO: error: this configuration requires -mlong-double-128 IBM extended format support" >&5
-echo "$as_me: error: this configuration requires -mlong-double-128 IBM extended format support" >&2;}
+$as_echo "$as_me: error: this configuration requires -mlong-double-128 IBM extended format support" >&2;}
   { (exit 1); exit 1; }; }
  fi
 fi
--- a/sysdeps/x86_64/elf/configure
+++ b/sysdeps/x86_64/elf/configure
@ -1,35 +1,3 @@
 as_nl='
 '
 export as_nl
 # Printing a long string crashes Solaris 7 /usr/bin/printf.
 as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
 as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
 if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
  as_echo='printf %s\n'
  as_echo_n='printf %s'
 else
  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
    as_echo_n='/usr/ucb/echo -n'
  else
    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
    as_echo_n_body='eval
      arg=$1;
      case $arg in
      *"$as_nl"*)
 	expr "X$arg" : "X\\(.*\\)$as_nl";
 	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
      esac;
      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
    '
    export as_echo_n_body
    as_echo_n='sh -c $as_echo_n_body as_echo'
  fi
  export as_echo_body
  as_echo='sh -c $as_echo_body as_echo'
 fi
 # This file is generated from configure.in by Autoconf.  DO NOT EDIT!
 # Local configure fragment for sysdeps/x86_64/elf.