Mercurial > hg > octave-lojdl > gnulib-hg

changeset 15468:c9762c11f058

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fclose: Move AC_LIBOBJ invocation to module description. * m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro. (gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE to 1. * modules/fclose (configure.ac): Invoke AC_LIBOBJ.
author Bruno Haible <bruno@clisp.org>
date Tue, 26 Jul 2011 00:01:49 +0200
parents d93da3ba94f8
children 7340707eeaf8
files ChangeLog m4/fclose.m4 modules/fclose
diffstat 3 files changed, 13 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-07-25  Bruno Haible  <bruno@clisp.org>
 
+	fclose: Move AC_LIBOBJ invocation to module description.
+	* m4/fclose.m4 (gl_REPLACE_FCLOSE): Remove macro.
+	(gl_FUNC_FCLOSE): Instead of gl_REPLACE_FCLOSE, just set REPLACE_FCLOSE
+	to 1.
+	* modules/fclose (configure.ac): Invoke AC_LIBOBJ.
+
 	fclose: Remove call-in from close.m4.
 	* m4/fclose.m4 (gl_FUNC_FCLOSE): Invoke gl_FUNC_CLOSE.
 	* m4/close.m4 (gl_FUNC_CLOSE): Don't invoke gl_REPLACE_FCLOSE.
--- a/m4/fclose.m4
+++ b/m4/fclose.m4
@@ -6,20 +6,15 @@
 
 AC_DEFUN([gl_FUNC_FCLOSE],
 [
+  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
+
   gl_FUNC_FFLUSH_STDIN
   if test $gl_cv_func_fflush_stdin = no; then
-    gl_REPLACE_FCLOSE
+    REPLACE_FCLOSE=1
   fi
 
   AC_REQUIRE([gl_FUNC_CLOSE])
   if test $REPLACE_CLOSE = 1; then
-    gl_REPLACE_FCLOSE
+    REPLACE_FCLOSE=1
   fi
 ])
-
-AC_DEFUN([gl_REPLACE_FCLOSE],
-[
-  AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  REPLACE_FCLOSE=1
-  AC_LIBOBJ([fclose])
-])
--- a/modules/fclose
+++ b/modules/fclose
@@ -14,6 +14,9 @@
 
 configure.ac:
 gl_FUNC_FCLOSE
+if test $REPLACE_FCLOSE = 1; then
+  AC_LIBOBJ([fclose])
+fi
 gl_STDIO_MODULE_INDICATOR([fclose])
 
 Makefile.am: