summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-21 15:47:36 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:31 +0200
commit8d60eb692fc98ca8efddc081dd509c9b0eac982b (patch)
tree92e3b8afccdc4e756c8371d41c1246ed5861ca96
parent2ccbc9ef6bd41aedb53d8d89b5b453034a74212b (diff)
downloadgnulib-8d60eb692fc98ca8efddc081dd509c9b0eac982b.tar.gz
mkfifo: Respect rules for use of AC_LIBOBJ.
* m4/mkfifo.m4 (gl_FUNC_MKFIFO): Move AC_LIBOBJ invocations from here... * modules/mkfifo (configure.ac): ... to here.
-rw-r--r--ChangeLog7
-rw-r--r--m4/mkfifo.m44
-rw-r--r--modules/mkfifo3
3 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 586e7886d8..680d73b5ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-21 Bruno Haible <bruno@clisp.org>
+ mkfifo: Respect rules for use of AC_LIBOBJ.
+ * m4/mkfifo.m4 (gl_FUNC_MKFIFO): Move AC_LIBOBJ invocations from
+ here...
+ * modules/mkfifo (configure.ac): ... to here.
+
+2011-05-21 Bruno Haible <bruno@clisp.org>
+
mkdtemp: Move AC_LIBOBJ invocations to module description.
* m4/mkdtemp.m4 (gl_FUNC_MKDTEMP): Move AC_LIBOBJ and gl_PREREQ_MKDTEMP
invocations from here...
diff --git a/m4/mkfifo.m4 b/m4/mkfifo.m4
index 4475e2effd..cfa2f738ba 100644
--- a/m4/mkfifo.m4
+++ b/m4/mkfifo.m4
@@ -1,4 +1,4 @@
-# serial 2
+# serial 3
# See if we need to provide mkfifo replacement.
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
@@ -14,7 +14,6 @@ AC_DEFUN([gl_FUNC_MKFIFO],
AC_CHECK_FUNCS_ONCE([mkfifo])
if test $ac_cv_func_mkfifo = no; then
HAVE_MKFIFO=0
- AC_LIBOBJ([mkfifo])
else
dnl Check for Solaris 9 and FreeBSD bug with trailing slash.
AC_CHECK_FUNCS_ONCE([lstat])
@@ -44,7 +43,6 @@ AC_DEFUN([gl_FUNC_MKFIFO],
AC_DEFINE([MKFIFO_TRAILING_SLASH_BUG], [1], [Define to 1 if mkfifo
does not reject trailing slash])
REPLACE_MKFIFO=1
- AC_LIBOBJ([mkfifo])
fi
fi
])
diff --git a/modules/mkfifo b/modules/mkfifo
index dae3755f73..7bf43b44c9 100644
--- a/modules/mkfifo
+++ b/modules/mkfifo
@@ -11,6 +11,9 @@ stat [test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1]
configure.ac:
gl_FUNC_MKFIFO
+if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then
+ AC_LIBOBJ([mkfifo])
+fi
gl_UNISTD_MODULE_INDICATOR([mkfifo])
Makefile.am: