Mercurial > gnulib
changeset 14685:f7f11056a86e
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>
line wrap: on
line diff
--- a/ChangeLog Wed May 04 12:22:12 2011 +0100 +++ b/ChangeLog Wed May 04 14:26:56 2011 -0600 @@ -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.
--- a/m4/arpa_inet_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/arpa_inet_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ ]], [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.
--- a/m4/btowc.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/btowc.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ esac fi if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - gl_REPLACE_WCHAR_H AC_LIBOBJ([btowc]) gl_PREREQ_BTOWC fi
--- a/m4/dirent_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/dirent_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ ]], [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.
--- a/m4/dirfd.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/dirfd.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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])
--- a/m4/duplocale.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/duplocale.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ HAVE_DUPLOCALE=0 fi if test $REPLACE_DUPLOCALE = 1; then - gl_REPLACE_LOCALE_H AC_LIBOBJ([duplocale]) gl_PREREQ_DUPLOCALE fi
--- a/m4/fchdir.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/fchdir.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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>
--- a/m4/fdopendir.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/fdopendir.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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 @@ [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
--- a/m4/inet_ntop.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/inet_ntop.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/inet_pton.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/inet_pton.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/ioctl.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/ioctl.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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 @@ if test $gl_cv_func_ioctl_posix_signature != yes; then REPLACE_IOCTL=1 AC_LIBOBJ([ioctl]) - gl_REPLACE_SYS_IOCTL_H fi fi ])
--- a/m4/locale_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/locale_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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 @@ [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.
--- a/m4/mbrlen.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/mbrlen.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ fi fi if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then - gl_REPLACE_WCHAR_H AC_LIBOBJ([mbrlen]) gl_PREREQ_MBRLEN fi
--- a/m4/mbrtowc.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/mbrtowc.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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 @@ 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
--- a/m4/mbsinit.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/mbsinit.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ fi fi if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then - gl_REPLACE_WCHAR_H AC_LIBOBJ([mbsinit]) gl_PREREQ_MBSINIT fi
--- a/m4/mbsnrtowcs.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/mbsnrtowcs.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/mbsrtowcs.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/mbsrtowcs.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/poll.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/poll.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ fi fi if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then - gl_REPLACE_POLL_H AC_LIBOBJ([poll]) gl_PREREQ_POLL else
--- a/m4/poll_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/poll_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ HAVE_POLL_H=1 else HAVE_POLL_H=0 - gl_REPLACE_POLL_H fi AC_SUBST([HAVE_POLL_H]) @@ -30,13 +29,6 @@ [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.
--- a/m4/setlocale.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/setlocale.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ mingw*) REPLACE_SETLOCALE=1 ;; esac if test $REPLACE_SETLOCALE = 1; then - gl_REPLACE_LOCALE_H AC_LIBOBJ([setlocale]) gl_PREREQ_SETLOCALE fi
--- a/m4/spawn_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/spawn_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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 @@ 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.
--- a/m4/sys_ioctl_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/sys_ioctl_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ ]], [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.
--- a/m4/wchar_h.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wchar_h.m4 Wed May 04 14:26:56 2011 -0600 @@ -7,7 +7,7 @@ dnl Written by Eric Blake. -# wchar_h.m4 serial 38 +# wchar_h.m4 serial 39 AC_DEFUN([gl_WCHAR_H], [ @@ -119,13 +119,6 @@ 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.
--- a/m4/wcrtomb.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wcrtomb.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ fi fi if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - gl_REPLACE_WCHAR_H AC_LIBOBJ([wcrtomb]) gl_PREREQ_WCRTOMB fi
--- a/m4/wcsnrtombs.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wcsnrtombs.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/wcsrtombs.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wcsrtombs.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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
--- a/m4/wctob.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wctob.m4 Wed May 04 14:26:56 2011 -0600 @@ -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_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 @@ *) 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 @@ ]) if test $ac_cv_have_decl_wctob != yes; then HAVE_DECL_WCTOB=0 - gl_REPLACE_WCHAR_H fi fi fi
--- a/m4/wcwidth.m4 Wed May 04 12:22:12 2011 +0100 +++ b/m4/wcwidth.m4 Wed May 04 14:26:56 2011 -0600 @@ -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 @@ 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. ])
--- a/modules/posix_spawn Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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
--- a/modules/posix_spawn_file_actions_addclose Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn_file_actions_addclose Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawn_file_actions_adddup2 Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn_file_actions_adddup2 Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawn_file_actions_addopen Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn_file_actions_addopen Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawn_file_actions_destroy Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn_file_actions_destroy Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawn_file_actions_init Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawn_file_actions_init Wed May 04 14:26:56 2011 -0600 @@ -13,7 +13,6 @@ 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])
--- a/modules/posix_spawnattr_destroy Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_destroy Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_getflags Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getflags Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_getpgroup Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getpgroup Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_getschedparam Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getschedparam Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawnattr_getschedpolicy Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getschedpolicy Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawnattr_getsigdefault Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getsigdefault Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_getsigmask Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_getsigmask Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_init Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_init Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_setflags Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setflags Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_setpgroup Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setpgroup Wed May 04 14:26:56 2011 -0600 @@ -11,7 +11,6 @@ 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])
--- a/modules/posix_spawnattr_setschedparam Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setschedparam Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawnattr_setschedpolicy Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setschedpolicy Wed May 04 14:26:56 2011 -0600 @@ -14,7 +14,6 @@ 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])
--- a/modules/posix_spawnattr_setsigdefault Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setsigdefault Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])
--- a/modules/posix_spawnattr_setsigmask Wed May 04 12:22:12 2011 +0100 +++ b/modules/posix_spawnattr_setsigmask Wed May 04 14:26:56 2011 -0600 @@ -12,7 +12,6 @@ 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])