summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-09 00:39:35 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:12 +0200
commitcfe70f65aabf1d16bcd9688b662407b20286821d (patch)
tree0e8eaa87f8e0cc6475f147fcdea2b96e8220adb4
parentda0c838e760661390dd503195fb5b2c7e8a5ddd7 (diff)
downloadgnulib-cfe70f65aabf1d16bcd9688b662407b20286821d.tar.gz
isapipe: Move AC_LIBOBJ invocations to module description.
* m4/isapipe.m4 (gl_ISAPIPE): Set HAVE_ISAPIPE. Move AC_LIBOBJ and gl_PREREQ_ISAPIPE invocations from here... * modules/isapipe (configure.ac): ... to here. (Depends-on): Update condition.
-rw-r--r--ChangeLog8
-rw-r--r--m4/isapipe.m48
-rw-r--r--modules/isapipe10
3 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9eec8fb518..e8faac1767 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2011-05-08 Bruno Haible <bruno@clisp.org>
+ isapipe: Move AC_LIBOBJ invocations to module description.
+ * m4/isapipe.m4 (gl_ISAPIPE): Set HAVE_ISAPIPE. Move AC_LIBOBJ and
+ gl_PREREQ_ISAPIPE invocations from here...
+ * modules/isapipe (configure.ac): ... to here.
+ (Depends-on): Update condition.
+
+2011-05-08 Bruno Haible <bruno@clisp.org>
+
ioctl: Move AC_LIBOBJ invocations to module description.
* m4/ioctl.m4 (gl_FUNC_IOCTL): Set HAVE_IOCTL. Move AC_LIBOBJ
invocations from here...
diff --git a/m4/isapipe.m4 b/m4/isapipe.m4
index 76402ff89a..3f6ff91f50 100644
--- a/m4/isapipe.m4
+++ b/m4/isapipe.m4
@@ -11,9 +11,11 @@ dnl Written by Paul Eggert.
AC_DEFUN([gl_ISAPIPE],
[
# OpenVMS has isapipe already, so check for it.
- AC_REPLACE_FUNCS([isapipe])
- if test $ac_cv_func_isapipe = no; then
- gl_PREREQ_ISAPIPE
+ AC_CHECK_FUNCS([isapipe])
+ if test $ac_cv_func_isapipe = yes; then
+ HAVE_ISAPIPE=1
+ else
+ HAVE_ISAPIPE=0
fi
])
diff --git a/modules/isapipe b/modules/isapipe
index ee1c2202d6..cc62ea8ce7 100644
--- a/modules/isapipe
+++ b/modules/isapipe
@@ -7,12 +7,16 @@ lib/isapipe.h
m4/isapipe.m4
Depends-on:
-stdbool [test $ac_cv_func_isapipe = no]
-sys_stat [test $ac_cv_func_isapipe = no]
-unistd [test $ac_cv_func_isapipe = no]
+stdbool [test $HAVE_ISAPIPE = 0]
+sys_stat [test $HAVE_ISAPIPE = 0]
+unistd [test $HAVE_ISAPIPE = 0]
configure.ac:
gl_ISAPIPE
+if test $HAVE_ISAPIPE = 0; then
+ AC_LIBOBJ([isapipe])
+ gl_PREREQ_ISAPIPE
+fi
Makefile.am: