Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7016:518e17651b9d
Avoid causing trouble in relocatable.c.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 22 Jul 2006 15:08:58 +0000 |
| parents | a84d5045e247 |
| children | 005fe24b840a |
| files | m4/ChangeLog m4/getline.m4 |
| diffstat | 2 files changed, 21 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,10 @@ +2006-07-19 Bruno Haible <bruno@clisp.org> + + * 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 <nmlarsgaard@atmel.no>. + 2005-12-04 Bruno Haible <bruno@clisp.org> * csharpexec.m4 (gt_CSHARPEXEC): Add support for 'clix' launcher
--- 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 @@ } ], 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 <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ >= 2) + Lucky GNU user + #endif +#endif + ], + [am_cv_func_working_getline=yes], + [am_cv_func_working_getline=no])] )]) fi