[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] maint: remove useless REPLACE_*_H macros
From: |
Eric Blake |
Subject: |
[PATCH 1/2] maint: remove useless REPLACE_*_H macros |
Date: |
Wed, 4 May 2011 16:37:18 -0600 |
There are still a few modules, like iconv_h.m4, that still
use older paradigms where GNULIB_POSIXCHECK is unsupported
and where gl_REPLACE_<HEADER>_H is still essential. But since
we are moving away from that style, I see no reason to keep
the idiom for the modules that don't need it.
* m4/arpa_inet_h.m4 (gl_REPLACE_ARPA_INET_H): Delete.
* m4/dirent_h.m4 (gl_REPLACE_DIRENT_H): Likewise.
* m4/locale_h.m4 (gl_REPLACE_LOCALE_H): Likewise.
* m4/poll_h.m4 (gl_REPLACE_POLL_H): Likewise.
* m4/spawn_h.m4 (gl_REPLACE_SPAWN_H): Likewise.
* m4/sys_ioctl_h.m4 (gl_REPLACE_SYS_IOCTL_H): Likewise.
* m4/wchar_h.m4 (gl_REPLACE_WCHAR_H): Likewise.
* m4/btowc.m4: Update callers.
* m4/dirfd.m4: Likewise.
* m4/duplocale.m4: Likewise.
* m4/fchdir.m4: Likewise.
* m4/fdopendir.m4: Likewise.
* m4/inet_ntop.m4: Likewise.
* m4/inet_pton.m4: Likewise.
* m4/ioctl.m4: Likewise.
* m4/mbrlen.m4: Likewise.
* m4/mbrtowc.m4: Likewise.
* m4/mbsinit.m4: Likewise.
* m4/mbsnrtowcs.m4: Likewise.
* m4/mbsrtowcs.m4: Likewise.
* m4/poll.m4: Likewise.
* m4/setlocale.m4: Likewise.
* m4/wcrtomb.m4: Likewise.
* m4/wcsnrtombs.m4: Likewise.
* m4/wcsrtombs.m4: Likewise.
* m4/wctob.m4: Likewise.
* m4/wcwidth.m4: Likewise.
* modules/posix_spawn: Likewise.
* modules/posix_spawn_file_actions_addclose: Likewise.
* modules/posix_spawn_file_actions_adddup2: Likewise.
* modules/posix_spawn_file_actions_addopen: Likewise.
* modules/posix_spawn_file_actions_destroy: Likewise.
* modules/posix_spawn_file_actions_init: Likewise.
* modules/posix_spawnattr_destroy: Likewise.
* modules/posix_spawnattr_getflags: Likewise.
* modules/posix_spawnattr_getpgroup: Likewise.
* modules/posix_spawnattr_getschedparam: Likewise.
* modules/posix_spawnattr_getschedpolicy: Likewise.
* modules/posix_spawnattr_getsigdefault: Likewise.
* modules/posix_spawnattr_getsigmask: Likewise.
* modules/posix_spawnattr_init: Likewise.
* modules/posix_spawnattr_setflags: Likewise.
* modules/posix_spawnattr_setpgroup: Likewise.
* modules/posix_spawnattr_setschedparam: Likewise.
* modules/posix_spawnattr_setschedpolicy: Likewise.
* modules/posix_spawnattr_setsigdefault: Likewise.
* modules/posix_spawnattr_setsigmask: Likewise.
* modules/posix_spawnp: Likewise.
Signed-off-by: Eric Blake <address@hidden>
---
This patch series, plus cleanups to test-fclose, was enough to get
libvirt back in shape. However, since I already promised to wait for
reviews for the test-fclose fix, I'll also wait to push these.
Patch 1 is a cleanup so that patch 2 didn't have to touch as many files.
ChangeLog | 52 +++++++++++++++++++++++++++++
m4/arpa_inet_h.m4 | 9 +----
m4/btowc.m4 | 3 +-
m4/dirent_h.m4 | 9 +----
m4/dirfd.m4 | 3 +-
m4/duplocale.m4 | 3 +-
m4/fchdir.m4 | 3 +-
m4/fdopendir.m4 | 4 +--
m4/inet_ntop.m4 | 4 +--
m4/inet_pton.m4 | 4 +--
m4/ioctl.m4 | 4 +--
m4/locale_h.m4 | 15 +--------
m4/mbrlen.m4 | 3 +-
m4/mbrtowc.m4 | 6 +---
m4/mbsinit.m4 | 3 +-
m4/mbsnrtowcs.m4 | 3 +-
m4/mbsrtowcs.m4 | 3 +-
m4/poll.m4 | 3 +-
m4/poll_h.m4 | 10 +-----
m4/setlocale.m4 | 3 +-
m4/spawn_h.m4 | 10 +-----
m4/sys_ioctl_h.m4 | 9 +----
m4/wchar_h.m4 | 9 +----
m4/wcrtomb.m4 | 3 +-
m4/wcsnrtombs.m4 | 3 +-
m4/wcsrtombs.m4 | 3 +-
m4/wctob.m4 | 5 +--
m4/wcwidth.m4 | 6 +---
modules/posix_spawn | 1 -
modules/posix_spawn_file_actions_addclose | 1 -
modules/posix_spawn_file_actions_adddup2 | 1 -
modules/posix_spawn_file_actions_addopen | 1 -
modules/posix_spawn_file_actions_destroy | 1 -
modules/posix_spawn_file_actions_init | 1 -
modules/posix_spawnattr_destroy | 1 -
modules/posix_spawnattr_getflags | 1 -
modules/posix_spawnattr_getpgroup | 1 -
modules/posix_spawnattr_getschedparam | 1 -
modules/posix_spawnattr_getschedpolicy | 1 -
modules/posix_spawnattr_getsigdefault | 1 -
modules/posix_spawnattr_getsigmask | 1 -
modules/posix_spawnattr_init | 1 -
modules/posix_spawnattr_setflags | 1 -
modules/posix_spawnattr_setpgroup | 1 -
modules/posix_spawnattr_setschedparam | 1 -
modules/posix_spawnattr_setschedpolicy | 1 -
modules/posix_spawnattr_setsigdefault | 1 -
modules/posix_spawnattr_setsigmask | 1 -
modules/posix_spawnp | 1 -
49 files changed, 79 insertions(+), 137 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8e9dd2b..197b073 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+2011-05-04 Eric Blake <address@hidden>
+
+ maint: remove useless REPLACE_*_H macros
+ * m4/arpa_inet_h.m4 (gl_REPLACE_ARPA_INET_H): Delete.
+ * m4/dirent_h.m4 (gl_REPLACE_DIRENT_H): Likewise.
+ * m4/locale_h.m4 (gl_REPLACE_LOCALE_H): Likewise.
+ * m4/poll_h.m4 (gl_REPLACE_POLL_H): Likewise.
+ * m4/spawn_h.m4 (gl_REPLACE_SPAWN_H): Likewise.
+ * m4/sys_ioctl_h.m4 (gl_REPLACE_SYS_IOCTL_H): Likewise.
+ * m4/wchar_h.m4 (gl_REPLACE_WCHAR_H): Likewise.
+ * m4/btowc.m4: Update callers.
+ * m4/dirfd.m4: Likewise.
+ * m4/duplocale.m4: Likewise.
+ * m4/fchdir.m4: Likewise.
+ * m4/fdopendir.m4: Likewise.
+ * m4/inet_ntop.m4: Likewise.
+ * m4/inet_pton.m4: Likewise.
+ * m4/ioctl.m4: Likewise.
+ * m4/mbrlen.m4: Likewise.
+ * m4/mbrtowc.m4: Likewise.
+ * m4/mbsinit.m4: Likewise.
+ * m4/mbsnrtowcs.m4: Likewise.
+ * m4/mbsrtowcs.m4: Likewise.
+ * m4/poll.m4: Likewise.
+ * m4/setlocale.m4: Likewise.
+ * m4/wcrtomb.m4: Likewise.
+ * m4/wcsnrtombs.m4: Likewise.
+ * m4/wcsrtombs.m4: Likewise.
+ * m4/wctob.m4: Likewise.
+ * m4/wcwidth.m4: Likewise.
+ * modules/posix_spawn: Likewise.
+ * modules/posix_spawn_file_actions_addclose: Likewise.
+ * modules/posix_spawn_file_actions_adddup2: Likewise.
+ * modules/posix_spawn_file_actions_addopen: Likewise.
+ * modules/posix_spawn_file_actions_destroy: Likewise.
+ * modules/posix_spawn_file_actions_init: Likewise.
+ * modules/posix_spawnattr_destroy: Likewise.
+ * modules/posix_spawnattr_getflags: Likewise.
+ * modules/posix_spawnattr_getpgroup: Likewise.
+ * modules/posix_spawnattr_getschedparam: Likewise.
+ * modules/posix_spawnattr_getschedpolicy: Likewise.
+ * modules/posix_spawnattr_getsigdefault: Likewise.
+ * modules/posix_spawnattr_getsigmask: Likewise.
+ * modules/posix_spawnattr_init: Likewise.
+ * modules/posix_spawnattr_setflags: Likewise.
+ * modules/posix_spawnattr_setpgroup: Likewise.
+ * modules/posix_spawnattr_setschedparam: Likewise.
+ * modules/posix_spawnattr_setschedpolicy: Likewise.
+ * modules/posix_spawnattr_setsigdefault: Likewise.
+ * modules/posix_spawnattr_setsigmask: Likewise.
+ * modules/posix_spawnp: Likewise.
+
2011-05-04 Reuben Thomas <address@hidden>
Add option to do-release-commit-and-tag to specify branch.
diff --git a/m4/arpa_inet_h.m4 b/m4/arpa_inet_h.m4
index d21b162..6dc0fdb 100644
--- a/m4/arpa_inet_h.m4
+++ b/m4/arpa_inet_h.m4
@@ -1,4 +1,4 @@
-# arpa_inet_h.m4 serial 11
+# arpa_inet_h.m4 serial 12
dnl Copyright (C) 2006, 2008-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,
@@ -38,13 +38,6 @@ AC_DEFUN([gl_HEADER_ARPA_INET],
]], [inet_ntop inet_pton])
])
-dnl Unconditionally enables the replacement of <arpa/inet.h>.
-AC_DEFUN([gl_REPLACE_ARPA_INET_H],
-[
- dnl This is a no-op, because <arpa/inet.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_ARPA_INET_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/btowc.m4 b/m4/btowc.m4
index 603298f..32bf0cf 100644
--- a/m4/btowc.m4
+++ b/m4/btowc.m4
@@ -1,4 +1,4 @@
-# btowc.m4 serial 8
+# btowc.m4 serial 9
dnl Copyright (C) 2008-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,
@@ -109,7 +109,6 @@ int main ()
esac
fi
if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([btowc])
gl_PREREQ_BTOWC
fi
diff --git a/m4/dirent_h.m4 b/m4/dirent_h.m4
index 853ac7d..fdc2c44 100644
--- a/m4/dirent_h.m4
+++ b/m4/dirent_h.m4
@@ -1,4 +1,4 @@
-# dirent_h.m4 serial 13
+# dirent_h.m4 serial 14
dnl Copyright (C) 2008-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,
@@ -21,13 +21,6 @@ AC_DEFUN([gl_DIRENT_H],
]], [alphasort dirfd fdopendir scandir])
])
-dnl Unconditionally enables the replacement of <dirent.h>.
-AC_DEFUN([gl_REPLACE_DIRENT_H],
-[
- dnl This is a no-op, because <dirent.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_DIRENT_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/dirfd.m4 b/m4/dirfd.m4
index b8789c2..f401f6c 100644
--- a/m4/dirfd.m4
+++ b/m4/dirfd.m4
@@ -1,4 +1,4 @@
-# serial 19 -*- Autoconf -*-
+# serial 20 -*- Autoconf -*-
dnl Find out how to get the file descriptor associated with an open DIR*.
@@ -12,7 +12,6 @@ dnl From Jim Meyering
AC_DEFUN([gl_FUNC_DIRFD],
[
AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
- gl_REPLACE_DIRENT_H
dnl Persuade glibc <dirent.h> to declare dirfd().
AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
diff --git a/m4/duplocale.m4 b/m4/duplocale.m4
index 4393d82..d61a8d2 100644
--- a/m4/duplocale.m4
+++ b/m4/duplocale.m4
@@ -1,4 +1,4 @@
-# duplocale.m4 serial 5
+# duplocale.m4 serial 6
dnl Copyright (C) 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,
@@ -60,7 +60,6 @@ int main ()
HAVE_DUPLOCALE=0
fi
if test $REPLACE_DUPLOCALE = 1; then
- gl_REPLACE_LOCALE_H
AC_LIBOBJ([duplocale])
gl_PREREQ_DUPLOCALE
fi
diff --git a/m4/fchdir.m4 b/m4/fchdir.m4
index 49d89d1..829373a 100644
--- a/m4/fchdir.m4
+++ b/m4/fchdir.m4
@@ -1,4 +1,4 @@
-# fchdir.m4 serial 15
+# fchdir.m4 serial 16
dnl Copyright (C) 2006-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,
@@ -33,7 +33,6 @@ AC_DEFUN([gl_FUNC_FCHDIR],
gl_REPLACE_DUP2
dnl dup3 is already unconditionally replaced
gl_REPLACE_FCNTL
- gl_REPLACE_DIRENT_H
AC_CACHE_CHECK([whether open can visit directories],
[gl_cv_func_open_directory_works],
[AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <fcntl.h>
diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4
index f192a62..05aa772 100644
--- a/m4/fdopendir.m4
+++ b/m4/fdopendir.m4
@@ -1,4 +1,4 @@
-# serial 5
+# serial 6
# See if we need to provide fdopendir.
dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
@@ -19,7 +19,6 @@ AC_DEFUN([gl_FUNC_FDOPENDIR],
if test $ac_cv_func_fdopendir = no; then
AC_LIBOBJ([openat-proc])
AC_LIBOBJ([fdopendir])
- gl_REPLACE_DIRENT_H
HAVE_FDOPENDIR=0
else
AC_CACHE_CHECK([whether fdopendir works],
@@ -42,7 +41,6 @@ extern DIR *fdopendir (int);
[gl_cv_func_fdopendir_works="guessing no"])])
if test "$gl_cv_func_fdopendir_works" != yes; then
REPLACE_FDOPENDIR=1
- gl_REPLACE_DIRENT_H
AC_LIBOBJ([fdopendir])
fi
fi
diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4
index 57580b8..0167dd2 100644
--- a/m4/inet_ntop.m4
+++ b/m4/inet_ntop.m4
@@ -1,4 +1,4 @@
-# inet_ntop.m4 serial 13
+# inet_ntop.m4 serial 14
dnl Copyright (C) 2005-2006, 2008-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,
@@ -9,8 +9,6 @@ AC_DEFUN([gl_FUNC_INET_NTOP],
dnl Persuade Solaris <arpa/inet.h> to declare inet_ntop.
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- gl_REPLACE_ARPA_INET_H
-
dnl Most platforms that provide inet_ntop define it in libc.
dnl Solaris 8..10 provide inet_ntop in libnsl instead.
gl_save_LIBS=$LIBS
diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4
index 9a7ad3b..073df21 100644
--- a/m4/inet_pton.m4
+++ b/m4/inet_pton.m4
@@ -1,4 +1,4 @@
-# inet_pton.m4 serial 11
+# inet_pton.m4 serial 12
dnl Copyright (C) 2006, 2008-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,
@@ -9,8 +9,6 @@ AC_DEFUN([gl_FUNC_INET_PTON],
dnl Persuade Solaris <arpa/inet.h> to declare inet_pton.
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
- gl_REPLACE_ARPA_INET_H
-
dnl Most platforms that provide inet_pton define it in libc.
dnl Solaris 8..10 provide inet_pton in libnsl instead.
gl_save_LIBS=$LIBS
diff --git a/m4/ioctl.m4 b/m4/ioctl.m4
index 8cb36d8..3c17a2e 100644
--- a/m4/ioctl.m4
+++ b/m4/ioctl.m4
@@ -1,4 +1,4 @@
-# ioctl.m4 serial 1
+# ioctl.m4 serial 2
dnl Copyright (C) 2008-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,
@@ -13,7 +13,6 @@ AC_DEFUN([gl_FUNC_IOCTL],
dnl application may use it and pass file descriptors that refer to
dnl sockets to the ioctl() function. So enable the support for sockets.
AC_LIBOBJ([ioctl])
- gl_REPLACE_SYS_IOCTL_H
else
AC_CHECK_FUNCS([ioctl])
dnl On glibc systems, the second parameter is 'unsigned long int request',
@@ -32,7 +31,6 @@ AC_DEFUN([gl_FUNC_IOCTL],
if test $gl_cv_func_ioctl_posix_signature != yes; then
REPLACE_IOCTL=1
AC_LIBOBJ([ioctl])
- gl_REPLACE_SYS_IOCTL_H
fi
fi
])
diff --git a/m4/locale_h.m4 b/m4/locale_h.m4
index 4d0f894..e77a303 100644
--- a/m4/locale_h.m4
+++ b/m4/locale_h.m4
@@ -1,4 +1,4 @@
-# locale_h.m4 serial 13
+# locale_h.m4 serial 14
dnl Copyright (C) 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,
@@ -57,12 +57,6 @@ AC_DEFUN([gl_LOCALE_H],
dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
gl_NEXT_HEADERS([locale.h])
- if test -n "$STDDEF_H" \
- || test $gl_cv_header_locale_h_posix2001 = no \
- || test $gl_cv_header_locale_h_needs_xlocale_h = yes; then
- gl_REPLACE_LOCALE_H
- fi
-
dnl Check for declarations of anything we want to poison if the
dnl corresponding gnulib module is not in use.
gl_WARN_ON_USE_PREPARE([[#include <locale.h>
@@ -74,13 +68,6 @@ AC_DEFUN([gl_LOCALE_H],
[setlocale duplocale])
])
-dnl Unconditionally enables the replacement of <locale.h>.
-AC_DEFUN([gl_REPLACE_LOCALE_H],
-[
- dnl This is a no-op, because <locale.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4
index b056895..8f55e36 100644
--- a/m4/mbrlen.m4
+++ b/m4/mbrlen.m4
@@ -1,4 +1,4 @@
-# mbrlen.m4 serial 5
+# mbrlen.m4 serial 6
dnl Copyright (C) 2008, 2010-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,
@@ -23,7 +23,6 @@ AC_DEFUN([gl_FUNC_MBRLEN],
fi
fi
if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbrlen])
gl_PREREQ_MBRLEN
fi
diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4
index c353862..b5b6aaa 100644
--- a/m4/mbrtowc.m4
+++ b/m4/mbrtowc.m4
@@ -1,4 +1,4 @@
-# mbrtowc.m4 serial 22
+# mbrtowc.m4 serial 23
dnl Copyright (C) 2001-2002, 2004-2005, 2008-2011 Free Software Foundation,
dnl Inc.
dnl This file is free software; the Free Software Foundation
@@ -54,7 +54,6 @@ AC_DEFUN([gl_FUNC_MBRTOWC],
fi
fi
if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbrtowc])
gl_PREREQ_MBRTOWC
fi
@@ -88,9 +87,6 @@ AC_DEFUN([gl_MBSTATE_T_BROKEN],
else
REPLACE_MBSTATE_T=1
fi
- if test $REPLACE_MBSTATE_T = 1; then
- gl_REPLACE_WCHAR_H
- fi
])
dnl Test whether mbrtowc puts the state into non-initial state when parsing an
diff --git a/m4/mbsinit.m4 b/m4/mbsinit.m4
index 47e2d14..b42a49a 100644
--- a/m4/mbsinit.m4
+++ b/m4/mbsinit.m4
@@ -1,4 +1,4 @@
-# mbsinit.m4 serial 5
+# mbsinit.m4 serial 6
dnl Copyright (C) 2008, 2010-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,
@@ -28,7 +28,6 @@ AC_DEFUN([gl_FUNC_MBSINIT],
fi
fi
if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbsinit])
gl_PREREQ_MBSINIT
fi
diff --git a/m4/mbsnrtowcs.m4 b/m4/mbsnrtowcs.m4
index 1ba443e..d72942f 100644
--- a/m4/mbsnrtowcs.m4
+++ b/m4/mbsnrtowcs.m4
@@ -1,4 +1,4 @@
-# mbsnrtowcs.m4 serial 2
+# mbsnrtowcs.m4 serial 3
dnl Copyright (C) 2008, 2010-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,
@@ -23,7 +23,6 @@ AC_DEFUN([gl_FUNC_MBSNRTOWCS],
fi
fi
if test $HAVE_MBSNRTOWCS = 0 || test $REPLACE_MBSNRTOWCS = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbsnrtowcs])
AC_LIBOBJ([mbsrtowcs-state])
gl_PREREQ_MBSNRTOWCS
diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4
index 1fe8dcf..4410741 100644
--- a/m4/mbsrtowcs.m4
+++ b/m4/mbsrtowcs.m4
@@ -1,4 +1,4 @@
-# mbsrtowcs.m4 serial 10
+# mbsrtowcs.m4 serial 11
dnl Copyright (C) 2008-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,
@@ -26,7 +26,6 @@ AC_DEFUN([gl_FUNC_MBSRTOWCS],
fi
fi
if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([mbsrtowcs])
AC_LIBOBJ([mbsrtowcs-state])
gl_PREREQ_MBSRTOWCS
diff --git a/m4/poll.m4 b/m4/poll.m4
index 4f8df1e..d226e1c 100644
--- a/m4/poll.m4
+++ b/m4/poll.m4
@@ -1,4 +1,4 @@
-# poll.m4 serial 12
+# poll.m4 serial 13
dnl Copyright (c) 2003, 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,
@@ -63,7 +63,6 @@ This is MacOSX or AIX
fi
fi
if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then
- gl_REPLACE_POLL_H
AC_LIBOBJ([poll])
gl_PREREQ_POLL
else
diff --git a/m4/poll_h.m4 b/m4/poll_h.m4
index 758f29b..3f2abf4 100644
--- a/m4/poll_h.m4
+++ b/m4/poll_h.m4
@@ -1,4 +1,4 @@
-# poll_h.m4 serial 1
+# poll_h.m4 serial 2
dnl Copyright (C) 2010-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,
@@ -17,7 +17,6 @@ AC_DEFUN([gl_POLL_H],
HAVE_POLL_H=1
else
HAVE_POLL_H=0
- gl_REPLACE_POLL_H
fi
AC_SUBST([HAVE_POLL_H])
@@ -30,13 +29,6 @@ AC_DEFUN([gl_POLL_H],
[poll])
])
-dnl Unconditionally enables the replacement of <poll.h>.
-AC_DEFUN([gl_REPLACE_POLL_H],
-[
- dnl This is a no-op, because <poll.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_POLL_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/setlocale.m4 b/m4/setlocale.m4
index 6672c34..cc3ab77 100644
--- a/m4/setlocale.m4
+++ b/m4/setlocale.m4
@@ -1,4 +1,4 @@
-# setlocale.m4 serial 1
+# setlocale.m4 serial 2
dnl Copyright (C) 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,
@@ -14,7 +14,6 @@ AC_DEFUN([gl_FUNC_SETLOCALE],
mingw*) REPLACE_SETLOCALE=1 ;;
esac
if test $REPLACE_SETLOCALE = 1; then
- gl_REPLACE_LOCALE_H
AC_LIBOBJ([setlocale])
gl_PREREQ_SETLOCALE
fi
diff --git a/m4/spawn_h.m4 b/m4/spawn_h.m4
index a044e37..4903b6a 100644
--- a/m4/spawn_h.m4
+++ b/m4/spawn_h.m4
@@ -1,4 +1,4 @@
-# spawn_h.m4 serial 12
+# spawn_h.m4 serial 13
dnl Copyright (C) 2008-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,
@@ -28,7 +28,6 @@ AC_DEFUN([gl_SPAWN_H],
HAVE_SPAWN_H=0
HAVE_POSIX_SPAWNATTR_T=0
HAVE_POSIX_SPAWN_FILE_ACTIONS_T=0
- gl_REPLACE_SPAWN_H
fi
AC_SUBST([HAVE_SPAWN_H])
@@ -65,13 +64,6 @@ AC_DEFUN([gl_HAVE_POSIX_SPAWN],
fi
])
-dnl Unconditionally enables the replacement of <spawn.h>.
-AC_DEFUN([gl_REPLACE_SPAWN_H],
-[
- dnl This is a no-op, because <spawn.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_SPAWN_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/sys_ioctl_h.m4 b/m4/sys_ioctl_h.m4
index 97cab84..8c7d112 100644
--- a/m4/sys_ioctl_h.m4
+++ b/m4/sys_ioctl_h.m4
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 9
+# sys_ioctl_h.m4 serial 10
dnl Copyright (C) 2008-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,
@@ -44,13 +44,6 @@ AC_DEFUN([gl_SYS_IOCTL_H],
]], [ioctl])
])
-dnl Unconditionally enables the replacement of <sys/ioctl.h>.
-AC_DEFUN([gl_REPLACE_SYS_IOCTL_H],
-[
- dnl This is a no-op, because <sys/ioctl.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_SYS_IOCTL_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/wchar_h.m4 b/m4/wchar_h.m4
index 6255ff3..977491f 100644
--- a/m4/wchar_h.m4
+++ b/m4/wchar_h.m4
@@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is
preserved.
dnl Written by Eric Blake.
-# wchar_h.m4 serial 38
+# wchar_h.m4 serial 39
AC_DEFUN([gl_WCHAR_H],
[
@@ -119,13 +119,6 @@ Configuration aborted.])
fi
])
-dnl Unconditionally enables the replacement of <wchar.h>.
-AC_DEFUN([gl_REPLACE_WCHAR_H],
-[
- dnl This is a no-op, because <wchar.h> is always overridden.
- :
-])
-
AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4
index 2905d9b..4f58e3f 100644
--- a/m4/wcrtomb.m4
+++ b/m4/wcrtomb.m4
@@ -1,4 +1,4 @@
-# wcrtomb.m4 serial 8
+# wcrtomb.m4 serial 9
dnl Copyright (C) 2008-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,
@@ -89,7 +89,6 @@ int main ()
fi
fi
if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([wcrtomb])
gl_PREREQ_WCRTOMB
fi
diff --git a/m4/wcsnrtombs.m4 b/m4/wcsnrtombs.m4
index 5607807..ba61129 100644
--- a/m4/wcsnrtombs.m4
+++ b/m4/wcsnrtombs.m4
@@ -1,4 +1,4 @@
-# wcsnrtombs.m4 serial 3
+# wcsnrtombs.m4 serial 4
dnl Copyright (C) 2008-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,
@@ -20,7 +20,6 @@ AC_DEFUN([gl_FUNC_WCSNRTOMBS],
fi
fi
if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([wcsnrtombs])
AC_LIBOBJ([wcsrtombs-state])
gl_PREREQ_WCSNRTOMBS
diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4
index 19f0c78..cd51506 100644
--- a/m4/wcsrtombs.m4
+++ b/m4/wcsrtombs.m4
@@ -1,4 +1,4 @@
-# wcsrtombs.m4 serial 8
+# wcsrtombs.m4 serial 9
dnl Copyright (C) 2008-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,
@@ -35,7 +35,6 @@ AC_DEFUN([gl_FUNC_WCSRTOMBS],
fi
fi
if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([wcsrtombs])
AC_LIBOBJ([wcsrtombs-state])
gl_PREREQ_WCSRTOMBS
diff --git a/m4/wctob.m4 b/m4/wctob.m4
index 3b4633c..b66e755 100644
--- a/m4/wctob.m4
+++ b/m4/wctob.m4
@@ -1,4 +1,4 @@
-# wctob.m4 serial 7
+# wctob.m4 serial 8
dnl Copyright (C) 2008-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,
@@ -11,7 +11,6 @@ AC_DEFUN([gl_FUNC_WCTOB],
AC_CHECK_FUNCS_ONCE([wctob])
if test $ac_cv_func_wctob = no; then
HAVE_DECL_WCTOB=0
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([wctob])
gl_PREREQ_WCTOB
else
@@ -103,7 +102,6 @@ int main ()
*) REPLACE_WCTOB=1 ;;
esac
if test $REPLACE_WCTOB = 1; then
- gl_REPLACE_WCHAR_H
AC_LIBOBJ([wctob])
gl_PREREQ_WCTOB
else
@@ -121,7 +119,6 @@ int main ()
])
if test $ac_cv_have_decl_wctob != yes; then
HAVE_DECL_WCTOB=0
- gl_REPLACE_WCHAR_H
fi
fi
fi
diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4
index bf39d1d..dbcc231 100644
--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -1,4 +1,4 @@
-# wcwidth.m4 serial 18
+# wcwidth.m4 serial 19
dnl Copyright (C) 2006-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,
@@ -93,10 +93,6 @@ changequote([,])dnl
if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1; then
AC_LIBOBJ([wcwidth])
fi
- if test $ac_cv_func_wcwidth != yes || test $REPLACE_WCWIDTH = 1 \
- || test $HAVE_DECL_WCWIDTH = 0; then
- gl_REPLACE_WCHAR_H
- fi
dnl We don't substitute HAVE_WCWIDTH. We assume that if the system does not
dnl have the wcwidth function, then it does not declare it.
])
diff --git a/modules/posix_spawn b/modules/posix_spawn
index 2d4ddf3..54e08d8 100644
--- a/modules/posix_spawn
+++ b/modules/posix_spawn
@@ -12,7 +12,6 @@ posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test
$REPLACE_POSIX_SPAWN =
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn])
gl_POSIX_SPAWN_INTERNAL
fi
diff --git a/modules/posix_spawn_file_actions_addclose
b/modules/posix_spawn_file_actions_addclose
index d24a0c9..eef7b63 100644
--- a/modules/posix_spawn_file_actions_addclose
+++ b/modules/posix_spawn_file_actions_addclose
@@ -14,7 +14,6 @@ getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test
$REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_addclose])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
diff --git a/modules/posix_spawn_file_actions_adddup2
b/modules/posix_spawn_file_actions_adddup2
index 59c828e..1cab62f 100644
--- a/modules/posix_spawn_file_actions_adddup2
+++ b/modules/posix_spawn_file_actions_adddup2
@@ -14,7 +14,6 @@ getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test
$REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_adddup2])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
diff --git a/modules/posix_spawn_file_actions_addopen
b/modules/posix_spawn_file_actions_addopen
index f828976..464e649 100644
--- a/modules/posix_spawn_file_actions_addopen
+++ b/modules/posix_spawn_file_actions_addopen
@@ -14,7 +14,6 @@ getdtablesize [test $HAVE_POSIX_SPAWN = 0 || test
$REPLACE_POSIX_SPAWN = 1]
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_addopen])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
diff --git a/modules/posix_spawn_file_actions_destroy
b/modules/posix_spawn_file_actions_destroy
index 8ca5aa2..ae1ea0d 100644
--- a/modules/posix_spawn_file_actions_destroy
+++ b/modules/posix_spawn_file_actions_destroy
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_destroy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
diff --git a/modules/posix_spawn_file_actions_init
b/modules/posix_spawn_file_actions_init
index 7431aab..7afc5be 100644
--- a/modules/posix_spawn_file_actions_init
+++ b/modules/posix_spawn_file_actions_init
@@ -13,7 +13,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawn_faction_init])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
diff --git a/modules/posix_spawnattr_destroy b/modules/posix_spawnattr_destroy
index 426b382..59fd22b 100644
--- a/modules/posix_spawnattr_destroy
+++ b/modules/posix_spawnattr_destroy
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_destroy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
diff --git a/modules/posix_spawnattr_getflags b/modules/posix_spawnattr_getflags
index 47a70dd..ffade0c 100644
--- a/modules/posix_spawnattr_getflags
+++ b/modules/posix_spawnattr_getflags
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getflags])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getflags])
diff --git a/modules/posix_spawnattr_getpgroup
b/modules/posix_spawnattr_getpgroup
index 60d62cc..58e59d3 100644
--- a/modules/posix_spawnattr_getpgroup
+++ b/modules/posix_spawnattr_getpgroup
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getpgroup])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getpgroup])
diff --git a/modules/posix_spawnattr_getschedparam
b/modules/posix_spawnattr_getschedparam
index c8cd1e4..6767db6 100644
--- a/modules/posix_spawnattr_getschedparam
+++ b/modules/posix_spawnattr_getschedparam
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedparam = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedparam])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedparam])
diff --git a/modules/posix_spawnattr_getschedpolicy
b/modules/posix_spawnattr_getschedpolicy
index a3be8cc..19188c9 100644
--- a/modules/posix_spawnattr_getschedpolicy
+++ b/modules/posix_spawnattr_getschedpolicy
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedpolicy = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getschedpolicy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getschedpolicy])
diff --git a/modules/posix_spawnattr_getsigdefault
b/modules/posix_spawnattr_getsigdefault
index 6a93722..980a59a 100644
--- a/modules/posix_spawnattr_getsigdefault
+++ b/modules/posix_spawnattr_getsigdefault
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getdefault])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigdefault])
diff --git a/modules/posix_spawnattr_getsigmask
b/modules/posix_spawnattr_getsigmask
index a984e96..3435de2 100644
--- a/modules/posix_spawnattr_getsigmask
+++ b/modules/posix_spawnattr_getsigmask
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_getsigmask])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_getsigmask])
diff --git a/modules/posix_spawnattr_init b/modules/posix_spawnattr_init
index 796f264..fd8a116 100644
--- a/modules/posix_spawnattr_init
+++ b/modules/posix_spawnattr_init
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_init])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
diff --git a/modules/posix_spawnattr_setflags b/modules/posix_spawnattr_setflags
index 54cbc99..2fad145 100644
--- a/modules/posix_spawnattr_setflags
+++ b/modules/posix_spawnattr_setflags
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setflags])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
diff --git a/modules/posix_spawnattr_setpgroup
b/modules/posix_spawnattr_setpgroup
index 6affe36..4f00f63 100644
--- a/modules/posix_spawnattr_setpgroup
+++ b/modules/posix_spawnattr_setpgroup
@@ -11,7 +11,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setpgroup])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setpgroup])
diff --git a/modules/posix_spawnattr_setschedparam
b/modules/posix_spawnattr_setschedparam
index eb448f8..6827501 100644
--- a/modules/posix_spawnattr_setschedparam
+++ b/modules/posix_spawnattr_setschedparam
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedparam = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedparam])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedparam])
diff --git a/modules/posix_spawnattr_setschedpolicy
b/modules/posix_spawnattr_setschedpolicy
index 44b487b..2de648d 100644
--- a/modules/posix_spawnattr_setschedpolicy
+++ b/modules/posix_spawnattr_setschedpolicy
@@ -14,7 +14,6 @@ gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 \
|| test $REPLACE_POSIX_SPAWN = 1 \
|| test $gl_cv_func_spawnattr_setschedpolicy = no; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setschedpolicy])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setschedpolicy])
diff --git a/modules/posix_spawnattr_setsigdefault
b/modules/posix_spawnattr_setsigdefault
index e9f5bb1..3d8ec56 100644
--- a/modules/posix_spawnattr_setsigdefault
+++ b/modules/posix_spawnattr_setsigdefault
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setdefault])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigdefault])
diff --git a/modules/posix_spawnattr_setsigmask
b/modules/posix_spawnattr_setsigmask
index d73840b..5e2bf44 100644
--- a/modules/posix_spawnattr_setsigmask
+++ b/modules/posix_spawnattr_setsigmask
@@ -12,7 +12,6 @@ spawn
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnattr_setsigmask])
fi
gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
diff --git a/modules/posix_spawnp b/modules/posix_spawnp
index 7e24647..ec6accb 100644
--- a/modules/posix_spawnp
+++ b/modules/posix_spawnp
@@ -12,7 +12,6 @@ posix_spawn-internal [test $HAVE_POSIX_SPAWN = 0 || test
$REPLACE_POSIX_SPAWN =
configure.ac:
gl_POSIX_SPAWN
if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
- gl_REPLACE_SPAWN_H
AC_LIBOBJ([spawnp])
gl_POSIX_SPAWN_INTERNAL
fi
--
1.7.4.4