Don't cause trouble in relocatable.c.

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 58f1b85d9b62ec50fb99b03e91d939c17cd2f45f..89e8b3b3f290ec2ac6e24358b02b5e5587c1145c 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/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>.
+
 2006-06-28  Bruno Haible  <bruno@clisp.org>
 
        Assume <dirent.h> on all Unix platforms. Assume closedir works.

diff --git a/gettext-tools/m4/getline.m4 b/gettext-tools/m4/getline.m4
index 867692334d750da5d67c4026dc18d756f91753fe..fd49559d3a90dcdf73c66e0658587c4bdef10d58 100644 (file)
--- a/gettext-tools/m4/getline.m4
+++ b/gettext-tools/m4/getline.m4
@@ -1,6 +1,6 @@
-# getline.m4 serial 9
+# getline.m4 serial 10
 
-dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software
+dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2006 Free Software
 dnl Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -42,7 +42,18 @@ AC_DEFUN([AM_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 ir 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