diff options
author | Andy Wingo <wingo@pobox.com> | 2013-03-09 19:08:51 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-03-09 19:08:51 +0100 |
commit | 1adba49ab20ac283ca62963f115910f1cf7b63ad (patch) | |
tree | fd535f2f761dce90fde8e7baafcea1aca1314ed7 /m4 | |
parent | 09b204d38756f0fa9ab4319874c8ce2838488dd0 (diff) | |
download | guile-1adba49ab20ac283ca62963f115910f1cf7b63ad.tar.gz |
Import `pipe-posix' module from gnulib.
* lib/Makefile.am:
* lib/pipe.c:
* m4/gnulib-cache.m4:
* m4/gnulib-comp.m4:
* m4/pipe.m4: Add pipe-posix module.
Diffstat (limited to 'm4')
-rw-r--r-- | m4/gnulib-cache.m4 | 3 | ||||
-rw-r--r-- | m4/gnulib-comp.m4 | 8 | ||||
-rw-r--r-- | m4/pipe.m4 | 15 |
3 files changed, 25 insertions, 1 deletions
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index f8a973759..fe243f8ee 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl ceil clock-time close connect dirfd duplocale environ extensions flock floor fpieee frexp full-read full-write func gendocs getaddrinfo getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring listen localcharset locale log1p maintainer-makefile malloc-gnu malloca nl_langinfo nproc open pipe2 putenv recv recvfrom regex rename select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat times trunc verify vsnprintf warnings wchar +# gnulib-tool --import --dir=. --local-dir=gnulib-local --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl=3 --no-conditional-dependencies --libtool --macro-prefix=gl --no-vc-files accept alignof alloca-opt announce-gen autobuild bind byteswap canonicalize-lgpl ceil clock-time close connect dirfd duplocale environ extensions flock floor fpieee frexp full-read full-write func gendocs getaddrinfo getpeername getsockname getsockopt git-version-gen gitlog-to-changelog gnu-web-doc-update gnupload havelib iconv_open-utf inet_ntop inet_pton isinf isnan ldexp lib-symbol-versions lib-symbol-visibility libunistring listen localcharset locale log1p maintainer-makefile malloc-gnu malloca nl_langinfo nproc open pipe-posix pipe2 putenv recv recvfrom regex rename select send sendto setenv setsockopt shutdown socket stat-time stdlib strftime striconveh string sys_stat times trunc verify vsnprintf warnings wchar # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gnulib-local]) @@ -84,6 +84,7 @@ gl_MODULES([ nl_langinfo nproc open + pipe-posix pipe2 putenv recv diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 8dc269161..3a8172b87 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -146,6 +146,7 @@ AC_DEFUN([gl_EARLY], # Code from module nproc: # Code from module open: # Code from module pathmax: + # Code from module pipe-posix: # Code from module pipe2: # Code from module putenv: # Code from module raise: @@ -545,6 +546,11 @@ AC_SUBST([LTALLOCA]) fi gl_FCNTL_MODULE_INDICATOR([open]) gl_PATHMAX + gl_FUNC_PIPE + if test $HAVE_PIPE = 0; then + AC_LIBOBJ([pipe]) + fi + gl_UNISTD_MODULE_INDICATOR([pipe]) gl_FUNC_PIPE2 gl_UNISTD_MODULE_INDICATOR([pipe2]) gl_FUNC_PUTENV @@ -994,6 +1000,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/nproc.h lib/open.c lib/pathmax.h + lib/pipe.c lib/pipe2.c lib/printf-args.c lib/printf-args.h @@ -1183,6 +1190,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/off_t.m4 m4/open.m4 m4/pathmax.m4 + m4/pipe.m4 m4/pipe2.m4 m4/printf.m4 m4/putenv.m4 diff --git a/m4/pipe.m4 b/m4/pipe.m4 new file mode 100644 index 000000000..583128332 --- /dev/null +++ b/m4/pipe.m4 @@ -0,0 +1,15 @@ +# pipe.m4 serial 2 +dnl Copyright (C) 2010-2013 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_FUNC_PIPE], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + + AC_CHECK_FUNCS_ONCE([pipe]) + if test $ac_cv_func_pipe != yes; then + HAVE_PIPE=0 + fi +]) |