maint: remove useless REPLACE_*_H macros

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 <eblake@redhat.com>

diff --git a/ChangeLog b/ChangeLog
index 8e9dd2ba451deb8dbe85092a8cc5280946593eb2..55c709fc25c04ecd15efd50977fe975d8fc34fdd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,55 @@
+2011-05-05  Eric Blake  <eblake@redhat.com>
+
+       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  <rrt@sc3d.org>
 
        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 d21b162fc71093e7260263cebbf73f952c98c0ad..6dc0fdb58b85240bd4fbb49e35be3be65834d268 100644 (file)
--- 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 603298f43f86fb6ce464b0a0d57b6f44cb2490b3..32bf0cfca0a1c492a7d54aa43c8fec5e9f7232e0 100644 (file)
--- 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 853ac7dad4aae8d1d98a9cf1d5475bfc7c519dfa..fdc2c440d646d58f990e9aa1e07471ca3aa511b0 100644 (file)
--- 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 b8789c2e7593604ce87512e98183fc8ee6303d4f..f401f6ced4846fb5cc7ea3fa9aab74e3a392bd83 100644 (file)
--- 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 4393d82dfb6780348d3b10ff06d4ad56f2b5ee9a..d61a8d2c562fc5f9a6f1d990d61543d53fe79da0 100644 (file)
--- 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 49d89d1840587ff642ff88764a37358d22d81047..829373a70781abd62edce0452e0b4fa3b566625e 100644 (file)
--- 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 f192a62830ad71004b805431ee5ce3af56864614..05aa77213f5000deba3eca0494126619c6b5393e 100644 (file)
--- 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 57580b8a4a7bd2cebfb45704ad5c7e4a3e2edf71..0167dd2b484ba81b7f3dadaf4e4fd67c534e7356 100644 (file)
--- 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 9a7ad3b384e130de810de8ab87c26cca5b8c8110..073df21a938a1fde01d409cd16819215c57b8aa0 100644 (file)
--- 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 8cb36d88fec16f21f8f1753d8939dce0acc35e4f..3c17a2ed47be5179d2fc3433a6a284abbb2ac35a 100644 (file)
--- 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 4d0f894261328808cbd53119b216aca97c1dfaa9..e77a3032eb8e355c10449d8b8e25afa34dc2ea5f 100644 (file)
--- 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 b056895b397630200f1e3704b86fb71fb35c6311..8f55e3627dad1820ae666d7eb09db45dc9bd878f 100644 (file)
--- 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 c353862973e4feda9a6d9036f39f76c6157fd804..b5b6aaa03102a099446a4dbc9b0050f23e4391e0 100644 (file)
--- 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 47e2d14a73538d34bb60946fd0af8dae40a26c6e..b42a49ab49811d53e3a9dbf3ebf2c564b6404ede 100644 (file)
--- 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 1ba443e5adda70b945859ff93bcc6ee50949840d..d72942f033aa2896d151d685e07b1b1836b5fcb4 100644 (file)
--- 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 1fe8dcf27d71a338192ae71f9f5f0c471cc4f92f..4410741d7839e6ff17ffaf23c8d2d2054e8db9e5 100644 (file)
--- 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 4f8df1e04a949e94dc6b72fad0e5a086e649b09a..d226e1c01160337d3f98ca1c025c23a5d1f3681a 100644 (file)
--- 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 758f29b0bf70b8f5a133bc526e7ff553b5da64a5..3f2abf49748a8f9b3c943f1d796685d350dda037 100644 (file)
--- 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 6672c34133cd68fefad636389fe188aaf6b3889a..cc3ab776f21742f2d6d1fd74449ce3a9f3468670 100644 (file)
--- 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 a044e372f0bf996d00dd04450c8f593a33d4daab..4903b6a4a19472fef1c9822ac184d62007695c0d 100644 (file)
--- 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 97cab84b067f4360f5e8674389b0dc0fbd6e3af9..8c7d112cf9bd010670dfe75aeca733fbd948b573 100644 (file)
--- 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 6255ff352dece31a7457778c0011fc3244ecbf59..977491fe8d2f1f28824476889ca1981ca5d10119 100644 (file)
--- 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 2905d9ba4de800c278347e38eda6057e693e591a..4f58e3f5de2bb3ce99b90bf478f9dea4ddc1f656 100644 (file)
--- 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 5607807bfd73ac385083e474bf7fa41f067c8a5f..ba61129a5beebbe6cefcd98c6440c845bdba3333 100644 (file)
--- 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 19f0c78a9e4565ee934e9a03b0af6e8482f275dd..cd51506a2b8864ab801e0a5c3352532ec2cb7c68 100644 (file)
--- 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 3b4633c42f5a309e6f10c5091bd16e5a4b425c49..b66e755d4d5b5a3e86b981ca4a14eef894de4dac 100644 (file)
--- 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 bf39d1d238c6fa1ee4b238aba01b32fe5728333a..dbcc231be4c0ab1f1a8088205c7ee85fb0c3a9fa 100644 (file)
--- 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 2d4ddf3865ebf1ebad753adf1b69f45e25bf58fb..54e08d841381151dfe6789d8b5a038f158d5b1a7 100644 (file)
--- 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 d24a0c9cc6ed227858677438c0bf2751bc4d364b..eef7b63c55b4e42f8776f6e6d5f6936cadae2d64 100644 (file)
--- 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 59c828e9b22a78f2b6ad986e0ad6c3493c240bfc..1cab62fb9cb17d8f1cbfeb81b222929d3f78e70c 100644 (file)
--- 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 f828976ea6f7d49e7052bfa7a65417d1bb6f5612..464e6491e8aacb8be1ec9f4f95f877c75a65b2b4 100644 (file)
--- 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 8ca5aa2f1174739193b46e2ed3b0ccfb4cee1f9a..ae1ea0d8862eaabbb052573eb3d5bff6334071f6 100644 (file)
--- 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 7431aabcc80330e73f344fc5aa21fa0b67fb7188..7afc5bef778ce0957fd8279374a1d79c2992bd3f 100644 (file)
--- 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 426b382abae52d37b2bc1280d26b53e9821b2854..59fd22bded98035be7422b3ae23f879f99d47a42 100644 (file)
--- 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 47a70dd2b02ca9b2ef7b9c752d52e61ecaaccc6c..ffade0c3d02d462f4d2195bd88a03500cd8f09e4 100644 (file)
--- 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 60d62ccae72a17a3899bafe3caab2aa5d275c053..58e59d31c13a27077bd064e3a99f0e1c1e06e0da 100644 (file)
--- 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 c8cd1e4c7145dfbcff4a544e89c4752ce1033291..6767db665cf1b9f2e72e7de7ca5937fb0a73e918 100644 (file)
--- 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 a3be8cc2393bcc5520ad71fb785d38837b4d9f28..19188c9cb53ab41b3758648069c935f3d04f5078 100644 (file)
--- 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 6a93722eff0310670a25545b9326eecbdb3d4e03..980a59acf0cee7d78e7dcb827fc8c33200964f5f 100644 (file)
--- 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 a984e96ec2f4505c8318afcc67a58a1046038d76..3435de2f25ba0764214ce27c976a41ef3c81d2c8 100644 (file)
--- 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 796f264208a5cd5f6bb5d719c8c0e62dda7b8af7..fd8a11677af05ede00f273d40b597322f1fd5fa3 100644 (file)
--- 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 54cbc991c66b91ace012921c9d7c00c5e69a52ba..2fad14506d87fbe75b6c28132e24915deb2da776 100644 (file)
--- 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 6affe367c6664cba6531cc2ae6acd9f462f1ec1f..4f00f63a799e5660462a566ec0f0f5356dbbe5f3 100644 (file)
--- 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 eb448f80f6c9cd0b0eb3005cd7c32baa973f4633..6827501a63082d790d92ee971abad28aa9283aab 100644 (file)
--- 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 44b487b13f008da35fd82b5f76bedb759651344d..2de648dd24c23376566ff583dc9ddab6a1282861 100644 (file)
--- 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 e9f5bb134a4a51bf642252879f86916910d3e585..3d8ec56d0c404cde12be4ac65c339bbec8574cd0 100644 (file)
--- 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 d73840b6a1919094c6e1ff863be364b37e7f45e8..5e2bf4496412890fff8f7538c146477a2da443e3 100644 (file)
--- 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 7e2464780d3ebbc6d12fce7f3e26f0ce41dc0ae2..ec6accb82d31cff4987b2f75ab095cd9562f9628 100644 (file)
--- 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