From 85324298b2acc2f756c3e162446c810507e4c08f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 5 May 2012 11:48:16 +0200 Subject: [PATCH] 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 "guessing yes". --- ChangeLog | 7 +++++++ m4/ungetc.m4 | 22 ++++++++++++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e2af4107..de58612bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 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 + "guessing yes". + +2012-05-05 Bruno Haible + signbit: Avoid "guessing no" when cross-compiling to glibc systems. * m4/signbit.m4 (gl_SIGNBIT): Require AC_CANONICAL_HOST. When cross- compiling to a glibc system, set gl_cv_func_signbit and diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 index 95bb3eb3b..9bc1ce763 100644 --- a/m4/ungetc.m4 +++ b/m4/ungetc.m4 @@ -1,4 +1,4 @@ -# ungetc.m4 serial 2 +# ungetc.m4 serial 3 dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,6 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], [ AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles AC_CACHE_CHECK([whether ungetc works on arbitrary bytes], [gl_cv_func_ungetc_works], @@ -27,10 +28,19 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], if (fgetc (f) != 'c') return 11; fclose (f); remove ("conftest.tmp");])], [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no], - [gl_cv_func_ungetc_works='guessing no']) + [case "$host_os" in + # Guess yes on glibc systems. + *-gnu*) gl_cv_func_ungetc_works="guessing yes" ;; + # If we don't know, assume the worst. + *) gl_cv_func_ungetc_works="guessing no" ;; + esac + ]) ]) - if test "$gl_cv_func_ungetc_works" != yes; then - AC_DEFINE([FUNC_UNGETC_BROKEN], [1], - [Define to 1 if ungetc is broken when used on arbitrary bytes.]) - fi + case "$gl_cv_func_ungetc_works" in + *yes) ;; + *) + AC_DEFINE([FUNC_UNGETC_BROKEN], [1], + [Define to 1 if ungetc is broken when used on arbitrary bytes.]) + ;; + esac ]) -- 2.11.0