Mercurial > hg > octave-nkf > gnulib-hg

changeset 15084:23a0cffe28de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rmdir: Respect rules for use of AC_LIBOBJ. * m4/rmdir.m4 (gl_FUNC_RMDIR): Move AC_LIBOBJ invocation from here... * modules/rmdir (configure.ac): ... to here.
author Bruno Haible <bruno@clisp.org>
date Sat, 21 May 2011 20:54:55 +0200
parents 0c86c6d851e0
children 0a705be282ae
files ChangeLog m4/rmdir.m4 modules/rmdir
diffstat 3 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+	rmdir: Respect rules for use of AC_LIBOBJ.
+	* m4/rmdir.m4 (gl_FUNC_RMDIR): Move AC_LIBOBJ invocation from here...
+	* modules/rmdir (configure.ac): ... to here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
 	renameat: Move AC_LIBOBJ invocations to module description.
 	* m4/renameat.m4 (gl_FUNC_RENAMEAT): Move AC_LIBOBJ invocations from
 	here...
--- a/m4/rmdir.m4
+++ b/m4/rmdir.m4
@@ -1,4 +1,4 @@
-# rmdir.m4 serial 10
+# rmdir.m4 serial 11
 dnl Copyright (C) 2002, 2005, 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,
@@ -30,6 +30,5 @@
      rm -rf conftest.dir conftest.file])
   if test x"$gl_cv_func_rmdir_works" != xyes; then
     REPLACE_RMDIR=1
-    AC_LIBOBJ([rmdir])
   fi
 ])
--- a/modules/rmdir
+++ b/modules/rmdir
@@ -12,6 +12,9 @@
 
 configure.ac:
 gl_FUNC_RMDIR
+if test $REPLACE_RMDIR = 1; then
+  AC_LIBOBJ([rmdir])
+fi
 gl_UNISTD_MODULE_INDICATOR([rmdir])
 
 Makefile.am: