Mercurial > hg > octave-lojdl > gnulib-hg

changeset 14959:27680dcf5c46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
getline: Move AC_LIBOBJ invocations to module description. * m4/getline.m4 (gl_FUNC_GETLINE): Move AC_LIBOBJ and gl_PREREQ_GETLINE invocations from here... * modules/getline (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sun, 08 May 2011 11:38:44 +0200
parents 0f9adf6a2b9e
children e04076de7206
files ChangeLog m4/getline.m4 modules/getline
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-08  Bruno Haible  <bruno@clisp.org>
+
+	getline: Move AC_LIBOBJ invocations to module description.
+	* m4/getline.m4 (gl_FUNC_GETLINE): Move AC_LIBOBJ and gl_PREREQ_GETLINE
+	invocations from here...
+	* modules/getline (configure.ac): ... to here.
+
 2011-05-08  Bruno Haible  <bruno@clisp.org>
 
 	getline: Simplify.
--- a/m4/getline.m4
+++ b/m4/getline.m4
@@ -1,4 +1,4 @@
-# getline.m4 serial 24
+# getline.m4 serial 25
 
 dnl Copyright (C) 1998-2003, 2005-2007, 2009-2011 Free Software Foundation,
 dnl Inc.
@@ -84,9 +84,6 @@
     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
   fi
 ])
 
--- a/modules/getline
+++ b/modules/getline
@@ -12,6 +12,10 @@
 
 configure.ac:
 gl_FUNC_GETLINE
+if test $REPLACE_GETLINE = 1; then
+  AC_LIBOBJ([getline])
+  gl_PREREQ_GETLINE
+fi
 gl_STDIO_MODULE_INDICATOR([getline])
 
 Makefile.am: