From: Bruno Haible <bruno@clisp.org>
Date: Sun, 8 May 2011 09:38:44 +0000 (+0200)
Subject: getline: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2567
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=c604bb86746f7f16471a598df94845e42d0e1b5f;p=gnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 0b89b3902..53ecdedd4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 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.
 	* m4/getline.m4 (gl_PREREQ_GETLINE): Don't invoke gl_FUNC_GETDELIM.
 	It's already handled through the module dependency.
diff --git a/m4/getline.m4 b/m4/getline.m4
index 4a99c315e..4c5779725 100644
--- 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 @@ AC_DEFUN([gl_FUNC_GETLINE],
     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
 ])
 
diff --git a/modules/getline b/modules/getline
index b565f6620..72e77abdc 100644
--- a/modules/getline
+++ b/modules/getline
@@ -12,6 +12,10 @@ getdelim        [test $REPLACE_GETLINE = 1]
 
 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: