From 251c566a3b21bb5700c7625c71d170b4b405172a Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Tue, 24 May 2011 01:52:04 +0200
Subject: [PATCH] popen-safer: Move AC_LIBOBJ invocations to module
 description.

* m4/stdio-safer.m4 (gl_POPEN_SAFER): Remove macro.
* modules/popen-safer (Files): Remove m4/stdio-safer.m4.
(configure.ac): Remove gl_POPEN_SAFER call.
(Makefile.am): Augment lib_SOURCES.
---
 ChangeLog           | 8 ++++++++
 m4/stdio-safer.m4   | 7 +------
 modules/popen-safer | 3 +--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7fcd5b65c1..7d2d38fdc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-05-23  Bruno Haible  <bruno@clisp.org>
+
+	popen-safer: Move AC_LIBOBJ invocations to module description.
+	* m4/stdio-safer.m4 (gl_POPEN_SAFER): Remove macro.
+	* modules/popen-safer (Files): Remove m4/stdio-safer.m4.
+	(configure.ac): Remove gl_POPEN_SAFER call.
+	(Makefile.am): Augment lib_SOURCES.
+
 2011-05-23  Bruno Haible  <bruno@clisp.org>
 
 	freopen-safer: Move AC_LIBOBJ invocations to module description.
diff --git a/m4/stdio-safer.m4 b/m4/stdio-safer.m4
index 83bf9c0f20..515947cb8f 100644
--- a/m4/stdio-safer.m4
+++ b/m4/stdio-safer.m4
@@ -1,14 +1,9 @@
-#serial 14
+#serial 15
 dnl Copyright (C) 2002, 2005-2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
 
-AC_DEFUN([gl_POPEN_SAFER],
-[
-  AC_LIBOBJ([popen-safer])
-])
-
 AC_DEFUN([gl_TMPFILE_SAFER],
 [
   AC_LIBOBJ([tmpfile-safer])
diff --git a/modules/popen-safer b/modules/popen-safer
index 76bf4ee552..3793976322 100644
--- a/modules/popen-safer
+++ b/modules/popen-safer
@@ -5,7 +5,6 @@ Files:
 lib/stdio--.h
 lib/stdio-safer.h
 lib/popen-safer.c
-m4/stdio-safer.m4
 
 Depends-on:
 cloexec
@@ -14,10 +13,10 @@ popen
 unistd-safer
 
 configure.ac:
-gl_POPEN_SAFER
 gl_MODULE_INDICATOR([popen-safer])
 
 Makefile.am:
+lib_SOURCES += popen-safer.c
 
 Include:
 "stdio-safer.h"
-- 
2.30.2