configure.ac: Fix __stack_chk_fail check for cross builds configured --with-headers

2010-01-31  Matthias Klose  <doko@ubuntu.com>

        * configure.ac: Fix __stack_chk_fail check for cross builds configured
        --with-headers
        * configure: Regenerate.

From-SVN: r156402

gcc/ChangeLog

+2010-01-31  Matthias Klose  <doko@ubuntu.com>
+
+	* configure.ac: Fix __stack_chk_fail check for cross builds configured
+	--with-headers
+	* configure: Regenerate.
+
 2010-01-29  Eric Botcazou  <ebotcazou@adacore.com>
 
 	* tree-ssa-alias.c (same_type_for_tbaa): Return -1 if the types have

gcc/configure

@@ -24570,7 +24570,9 @@ else
     case "$target" in
        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-	if test "x$with_sysroot" = x; then
+	if test "x$with_headers" != x; then
+	  glibc_header_dir=$with_headers
+	elif test "x$with_sysroot" = x; then
 	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
 	elif test "x$with_build_sysroot" != "x"; then
 	  glibc_header_dir="${with_build_sysroot}/usr/include"

gcc/configure.ac

@@ -3853,7 +3853,9 @@ AC_CACHE_CHECK(__stack_chk_fail in target C library,
     case "$target" in
        *-*-linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
       if test x$host != x$target || test "x$TARGET_SYSTEM_ROOT" != x; then
-	if test "x$with_sysroot" = x; then
+	if test "x$with_headers" != x; then
+	  glibc_header_dir=$with_headers
+	elif test "x$with_sysroot" = x; then
 	  glibc_header_dir="${exec_prefix}/${target_noncanonical}/sys-include"
 	elif test "x$with_build_sysroot" != "x"; then
 	  glibc_header_dir="${with_build_sysroot}/usr/include"