From b5b852899af5333cb8bef7c988b1b2883ca853bf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 May 2012 11:55:41 +0200 Subject: [PATCH] d-ino: Avoid guessing "no" when cross-compiling to glibc/Linux systems. * m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Require AC_CANONICAL_HOST. When cross-compiling to a glibc/Linux platform, set gl_cv_struct_dirent_d_ino to "guessing yes". --- ChangeLog | 7 +++++++ m4/d-ino.m4 | 23 ++++++++++++++++------- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index de58612bf..9f6d6c460 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2012-05-05 Bruno Haible + d-ino: Avoid guessing "no" when cross-compiling to glibc/Linux systems. + * m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Require + AC_CANONICAL_HOST. When cross-compiling to a glibc/Linux platform, + set gl_cv_struct_dirent_d_ino to "guessing yes". + +2012-05-05 Bruno Haible + fseeko-tests, ftello-tests: Avoid "guessing no" when cross-compiling. * m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Require AC_CANONICAL_HOST. When cross-compiling to a glibc platform, set gl_cv_func_ungetc_works to diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 03087bf5e..16d46aad9 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,4 +1,4 @@ -# serial 12 +# serial 13 dnl From Jim Meyering. dnl @@ -13,7 +13,8 @@ dnl # with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], - [AC_CACHE_CHECK([for d_ino member in directory struct], + [AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles + AC_CACHE_CHECK([for d_ino member in directory struct], gl_cv_struct_dirent_d_ino, [AC_RUN_IFELSE( [AC_LANG_PROGRAM( @@ -37,10 +38,18 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], ]])], [gl_cv_struct_dirent_d_ino=yes], [gl_cv_struct_dirent_d_ino=no], - [gl_cv_struct_dirent_d_ino=no])]) - if test $gl_cv_struct_dirent_d_ino = yes; then - AC_DEFINE([D_INO_IN_DIRENT], [1], - [Define if struct dirent has a member d_ino that actually works.]) - fi + [case "$host_os" in + # Guess yes on glibc systems with Linux kernel. + linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_struct_dirent_d_ino="guessing no" ;; + esac + ])]) + case "$gl_cv_struct_dirent_d_ino" in + *yes) + AC_DEFINE([D_INO_IN_DIRENT], [1], + [Define if struct dirent has a member d_ino that actually works.]) + ;; + esac ] ) -- 2.11.0