Mercurial > hg > octave-lojdl > gnulib-hg

changeset 12840:fec628f2b5af

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Undo last commit. Add comment instead.
author Bruno Haible <bruno@clisp.org>
date Sun, 31 Jan 2010 17:57:07 +0100
parents c6d23570567d
children 6ff1b1c23f57
files ChangeLog m4/getline.m4
diffstat 2 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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.
@@ -14,12 +18,6 @@
 
 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.
 	* m4/getline.m4 (gl_FUNC_GETLINE): Also test result for a NULL buffer
 	and a non-zero size.
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -80,9 +80,10 @@
   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