Undo last commit. Add comment instead.

diff --git a/ChangeLog b/ChangeLog
index 4fbc2a65b3e8325a2476114b816039f243d1e46b..f94e401a92ffff764c918f74b283ac0cc7846008 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-31  Bruno Haible  <bruno@clisp.org>
+
+       * m4/getline.m4 (gl_FUNC_GETLINE): Add comment about REPLACE_GETLINE.
+
 2010-01-31  Bruno Haible  <bruno@clisp.org>
 
        Work around getdelim() bug on FreeBSD 8.0.
@@ -12,12 +16,6 @@
        a non-zero size.
        * doc/posix-functions/getdelim.texi: Mention the FreeBSD bug.
 
-2010-01-31  Bruno Haible  <bruno@clisp.org>
-
-       Avoid redundant symbol replacement.
-       * m4/getline.m4 (gl_FUNC_GETLINE): Set REPLACE_GETLINE only when the
-       function was found.
-
 2010-01-31  Bruno Haible  <bruno@clisp.org>
 
        Work around getline() bug on FreeBSD 8.0.

diff --git a/m4/getline.m4 b/m4/getline.m4
index 996ca216559d61a7a42e407a8d633c0da8a10581..83005600d65b23657095a15d8b6d246d62f8da0e 100644 (file)
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -80,9 +80,10 @@ AC_DEFUN([gl_FUNC_GETLINE],
   fi
 
   if test $am_cv_func_working_getline = no; then
-    if test $gl_getline_needs_run_time_check = yes; then
-      REPLACE_GETLINE=1
-    fi
+    dnl Set REPLACE_GETLINE always: Even if we have not found the broken
+    dnl getline function among $LIBS, it may exist in libinet and the
+    dnl executable may be linked with -linet.
+    REPLACE_GETLINE=1
     AC_LIBOBJ([getline])
 
     gl_PREREQ_GETLINE