Avoid causing trouble in relocatable.c.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 55a3c99bbcaa934f579abb9d1631f376b9a0cfed..b9eb01e45cd1912e8f4c3844ec632d3da998133a 100644 (file)
--- 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

diff --git a/m4/getline.m4 b/m4/getline.m4
index ff255a36649f9d5413d2e8187872d9cd317714a1..f49c50eed809956db0f8d61d3f53ca2f26ed3b4a 100644 (file)
--- 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 <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