From e25db6ef2883dff6f76a689bda4a109d92d38f1d Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 22 Jul 2006 15:08:58 +0000 Subject: [PATCH] Avoid causing trouble in relocatable.c. --- m4/ChangeLog | 7 +++++++ m4/getline.m4 | 17 ++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/m4/ChangeLog b/m4/ChangeLog index 55a3c99bbc..b9eb01e45c 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2006-07-19 Bruno Haible + + * getline.m4 (AM_FUNC_GETLINE): When cross-compiling, assume that + getline works on glibc2 systems. Needed to avoid trouble in + relocatable.c. + Reported by Nils Magnus Larsgard . + 2005-12-04 Bruno Haible * csharpexec.m4 (gt_CSHARPEXEC): Add support for 'clix' launcher diff --git a/m4/getline.m4 b/m4/getline.m4 index ff255a3664..f49c50eed8 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,6 +1,6 @@ -# getline.m4 serial 13 +# getline.m4 serial 14 -dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Free Software +dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006 Free Software dnl Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation @@ -47,7 +47,18 @@ AC_DEFUN([gl_FUNC_GETLINE], } ], am_cv_func_working_getline=yes dnl The library version works. , am_cv_func_working_getline=no dnl The library version does NOT work. - , am_cv_func_working_getline=no dnl We're cross compiling. + , dnl We're cross compiling. Assume it works on glibc2 systems. + [AC_EGREP_CPP([Lucky GNU user], + [ +#include +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) + Lucky GNU user + #endif +#endif + ], + [am_cv_func_working_getline=yes], + [am_cv_func_working_getline=no])] )]) fi -- 2.30.2