[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
macros factorization
|
From: |
Bruno Haible |
|
Subject: |
macros factorization |
|
Date: |
Sat, 27 Mar 2010 18:41:52 +0100 |
|
User-agent: |
KMail/1.9.9 |
A small factorization of common code in .m4 files. This is a preparation for
the next commit.
2010-03-27 Bruno Haible <address@hidden>
Factorize common .m4 code.
* m4/gnulib-common.m4 (gl_MODULE_INDICATOR_SET_VARIABLE): New macro.
* m4/arpa_inet_h.m4 (gl_ARPA_INET_MODULE_INDICATOR): Use it.
* m4/ctype.m4 (gl_CTYPE_MODULE_INDICATOR): Likewise.
* m4/dirent_h.m4 (gl_DIRENT_MODULE_INDICATOR): Likewise.
* m4/fcntl_h.m4 (gl_FCNTL_MODULE_INDICATOR): Likewise.
* m4/iconv_h.m4 (gl_ICONV_MODULE_INDICATOR): Likewise.
* m4/inttypes.m4 (gl_INTTYPES_MODULE_INDICATOR): Likewise.
* m4/langinfo_h.m4 (gl_LANGINFO_MODULE_INDICATOR): Likewise.
* m4/locale_h.m4 (gl_LOCALE_MODULE_INDICATOR): Likewise.
* m4/math_h.m4 (gl_MATH_MODULE_INDICATOR): Likewise.
* m4/netdb_h.m4 (gl_NETDB_MODULE_INDICATOR): Likewise.
* m4/pty_h.m4 (gl_PTY_MODULE_INDICATOR): Likewise.
* m4/search_h.m4 (gl_SEARCH_MODULE_INDICATOR): Likewise.
* m4/signal_h.m4 (gl_SIGNAL_MODULE_INDICATOR): Likewise.
* m4/spawn_h.m4 (gl_SPAWN_MODULE_INDICATOR): Likewise.
* m4/stddef_h.m4 (gl_STDDEF_MODULE_INDICATOR): Likewise.
* m4/stdio_h.m4 (gl_STDIO_MODULE_INDICATOR): Likewise.
* m4/stdlib_h.m4 (gl_STDLIB_MODULE_INDICATOR): Likewise.
* m4/string_h.m4 (gl_STRING_MODULE_INDICATOR): Likewise.
* m4/strings_h.m4 (gl_STRINGS_MODULE_INDICATOR): Likewise.
* m4/sys_file_h.m4 (gl_HEADER_SYS_FILE_MODULE_INDICATOR): Likewise.
* m4/sys_ioctl_h.m4 (gl_SYS_IOCTL_MODULE_INDICATOR): Likewise.
* m4/sys_select_h.m4 (gl_SYS_SELECT_MODULE_INDICATOR): Likewise.
* m4/sys_socket_h.m4 (gl_SYS_SOCKET_MODULE_INDICATOR): Likewise.
* m4/sys_stat_h.m4 (gl_SYS_STAT_MODULE_INDICATOR): Likewise.
* m4/sys_time_h.m4 (gl_SYS_TIME_MODULE_INDICATOR): Likewise.
* m4/sys_times_h.m4 (gl_SYS_TIMES_MODULE_INDICATOR): Likewise.
* m4/sys_utsname_h.m4 (gl_SYS_UTSNAME_MODULE_INDICATOR): Likewise.
* m4/sys_wait_h.m4 (gl_SYS_WAIT_MODULE_INDICATOR): Likewise.
* m4/time_h.m4 (gl_TIME_MODULE_INDICATOR): Likewise.
* m4/unistd_h.m4 (gl_UNISTD_MODULE_INDICATOR): Likewise.
* m4/wchar_h.m4 (gl_WCHAR_MODULE_INDICATOR): Likewise.
--- m4/gnulib-common.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/gnulib-common.m4 Sat Mar 27 18:32:59 2010
@@ -1,4 +1,4 @@
-# gnulib-common.m4 serial 13
+# gnulib-common.m4 serial 14
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -37,6 +37,14 @@
])
])
+# gl_MODULE_INDICATOR_SET_VARIABLE([modulename])
+# sets the shell variable that indicates the presence of the given module to
+# a C preprocessor expression that will evaluate to 1.
+AC_DEFUN([gl_MODULE_INDICATOR_SET_VARIABLE],
+[
+
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+])
+
# gl_MODULE_INDICATOR([modulename])
# defines a C macro indicating the presence of the given module.
AC_DEFUN([gl_MODULE_INDICATOR],
--- m4/arpa_inet_h.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/arpa_inet_h.m4 Sat Mar 27 17:01:18 2010
@@ -1,4 +1,4 @@
-# arpa_inet_h.m4 serial 7
+# arpa_inet_h.m4 serial 8
dnl Copyright (C) 2006, 2008, 2009, 2010 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,7 +44,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_ARPA_INET_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_ARPA_INET_H_DEFAULTS],
--- m4/ctype.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/ctype.m4 Sat Mar 27 17:01:21 2010
@@ -1,4 +1,4 @@
-# ctype_h.m4 serial 4
+# ctype_h.m4 serial 5
dnl Copyright (C) 2009-2010 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,7 +21,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_CTYPE_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_CTYPE_H_DEFAULTS],
--- m4/dirent_h.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/dirent_h.m4 Sat Mar 27 17:01:24 2010
@@ -1,4 +1,4 @@
-# dirent_h.m4 serial 10
+# dirent_h.m4 serial 11
dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -32,7 +32,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_DIRENT_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/fcntl_h.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/fcntl_h.m4 Sat Mar 27 17:01:27 2010
@@ -1,4 +1,4 @@
-# serial 11
+# serial 12
# Configure fcntl.h.
dnl Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
@@ -24,7 +24,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/iconv_h.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/iconv_h.m4 Sat Mar 27 17:01:30 2010
@@ -1,4 +1,4 @@
-# iconv_h.m4 serial 5
+# iconv_h.m4 serial 6
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -24,7 +24,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_ICONV_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_ICONV_H_DEFAULTS],
--- m4/inttypes.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/inttypes.m4 Sat Mar 27 17:01:35 2010
@@ -1,4 +1,4 @@
-# inttypes.m4 serial 17
+# inttypes.m4 serial 18
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -285,7 +285,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_INTTYPES_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_INTTYPES_H_DEFAULTS],
--- m4/langinfo_h.m4.orig Sat Mar 27 18:33:25 2010
+++ m4/langinfo_h.m4 Sat Mar 27 17:01:43 2010
@@ -1,5 +1,5 @@
-# langinfo_h.m4 serial 5
-dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# langinfo_h.m4 serial 6
+dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -63,7 +63,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/locale_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/locale_h.m4 Sat Mar 27 17:01:57 2010
@@ -1,5 +1,5 @@
-# locale_h.m4 serial 9
-dnl Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# locale_h.m4 serial 10
+dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -78,7 +78,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/math_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/math_h.m4 Sat Mar 27 17:02:05 2010
@@ -1,4 +1,4 @@
-# math_h.m4 serial 19
+# math_h.m4 serial 20
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -47,7 +47,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_MATH_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/netdb_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/netdb_h.m4 Sat Mar 27 17:02:11 2010
@@ -1,4 +1,4 @@
-# netdb_h.m4 serial 6
+# netdb_h.m4 serial 7
dnl Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -31,7 +31,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_NETDB_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_NETDB_H_DEFAULTS],
--- m4/pty_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/pty_h.m4 Sat Mar 27 17:02:25 2010
@@ -1,4 +1,4 @@
-# pty_h.m4 serial 8
+# pty_h.m4 serial 9
dnl Copyright (C) 2009, 2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -48,7 +48,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_PTY_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/search_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/search_h.m4 Sat Mar 27 17:02:30 2010
@@ -1,4 +1,4 @@
-# search_h.m4 serial 6
+# search_h.m4 serial 7
dnl Copyright (C) 2007-2010 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,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SEARCH_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/signal_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/signal_h.m4 Sat Mar 27 17:07:54 2010
@@ -1,5 +1,5 @@
-# signal_h.m4 serial 10
-dnl Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# signal_h.m4 serial 11
+dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
@@ -27,7 +27,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SIGNAL_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/spawn_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/spawn_h.m4 Sat Mar 27 17:02:39 2010
@@ -1,4 +1,4 @@
-# spawn_h.m4 serial 10
+# spawn_h.m4 serial 11
dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -77,7 +77,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SPAWN_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/stddef_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/stddef_h.m4 Sat Mar 27 17:02:44 2010
@@ -1,5 +1,5 @@
dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues.
-# stddef_h.m4 serial 1
+# stddef_h.m4 serial 2
dnl Copyright (C) 2009, 2010 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,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_STDDEF_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_STDDEF_H_DEFAULTS],
--- m4/stdio_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/stdio_h.m4 Sat Mar 27 17:02:49 2010
@@ -1,4 +1,4 @@
-# stdio_h.m4 serial 26
+# stdio_h.m4 serial 27
dnl Copyright (C) 2007-2010 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,7 +44,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/stdlib_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/stdlib_h.m4 Sat Mar 27 17:02:54 2010
@@ -1,4 +1,4 @@
-# stdlib_h.m4 serial 26
+# stdlib_h.m4 serial 27
dnl Copyright (C) 2007-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -43,7 +43,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_STDLIB_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/string_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/string_h.m4 Sat Mar 27 17:02:58 2010
@@ -5,7 +5,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 12
+# serial 13
# Written by Paul Eggert.
@@ -34,7 +34,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/strings_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/strings_h.m4 Sat Mar 27 17:10:31 2010
@@ -1,7 +1,7 @@
# Configure a replacement for <string.h>.
-# serial 2
+# serial 3
-# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -28,7 +28,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_HEADER_STRINGS_H_DEFAULTS],
--- m4/sys_file_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_file_h.m4 Sat Mar 27 17:03:12 2010
@@ -1,5 +1,5 @@
# Configure a replacement for <sys/file.h>.
-# serial 4
+# serial 5
# Copyright (C) 2008-2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -32,7 +32,7 @@
AC_DEFUN([gl_HEADER_SYS_FILE_MODULE_INDICATOR],
[
AC_REQUIRE([gl_HEADER_SYS_FILE_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_HEADER_SYS_FILE_H_DEFAULTS],
--- m4/sys_ioctl_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_ioctl_h.m4 Sat Mar 27 17:03:18 2010
@@ -1,4 +1,4 @@
-# sys_ioctl_h.m4 serial 6
+# sys_ioctl_h.m4 serial 7
dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -55,7 +55,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/sys_select_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_select_h.m4 Sat Mar 27 17:03:25 2010
@@ -1,4 +1,4 @@
-# sys_select_h.m4 serial 13
+# sys_select_h.m4 serial 14
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -72,7 +72,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/sys_socket_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_socket_h.m4 Sat Mar 27 17:03:33 2010
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 16
+# sys_socket_h.m4 serial 17
dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -125,7 +125,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/sys_stat_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_stat_h.m4 Sat Mar 27 17:03:36 2010
@@ -1,4 +1,4 @@
-# sys_stat_h.m4 serial 23 -*- Autoconf -*-
+# sys_stat_h.m4 serial 24 -*- Autoconf -*-
dnl Copyright (C) 2006-2010 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,7 +38,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/sys_time_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_time_h.m4 Sat Mar 27 17:03:41 2010
@@ -1,5 +1,5 @@
# Configure a replacement for <sys/time.h>.
-# serial 5
+# serial 6
# Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -56,7 +56,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_HEADER_SYS_TIME_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/sys_times_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_times_h.m4 Sat Mar 27 17:03:46 2010
@@ -1,5 +1,5 @@
# Configure a replacement for <sys/times.h>.
-# serial 5
+# serial 6
# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
@@ -41,7 +41,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_TIMES_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_SYS_TIMES_H_DEFAULTS],
--- m4/sys_utsname_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_utsname_h.m4 Sat Mar 27 17:03:50 2010
@@ -1,4 +1,4 @@
-# sys_utsname_h.m4 serial 5
+# sys_utsname_h.m4 serial 6
dnl Copyright (C) 2009-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -36,7 +36,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_SYS_UTSNAME_H_DEFAULTS],
--- m4/sys_wait_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/sys_wait_h.m4 Sat Mar 27 17:03:55 2010
@@ -1,4 +1,4 @@
-# sys_wait_h.m4 serial 3
+# sys_wait_h.m4 serial 4
dnl Copyright (C) 2008-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -16,7 +16,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_SYS_WAIT_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
])
AC_DEFUN([gl_SYS_WAIT_H_DEFAULTS],
--- m4/time_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/time_h.m4 Sat Mar 27 17:04:02 2010
@@ -65,7 +65,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/unistd_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/unistd_h.m4 Sat Mar 27 16:55:46 2010
@@ -1,4 +1,4 @@
-# unistd_h.m4 serial 42
+# unistd_h.m4 serial 43
dnl Copyright (C) 2006-2010 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -46,7 +46,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
--- m4/wchar_h.m4.orig Sat Mar 27 18:33:26 2010
+++ m4/wchar_h.m4 Sat Mar 27 17:04:11 2010
@@ -7,7 +7,7 @@
dnl Written by Eric Blake.
-# wchar_h.m4 serial 32
+# wchar_h.m4 serial 33
AC_DEFUN([gl_WCHAR_H],
[
@@ -107,7 +107,7 @@
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
AC_REQUIRE([gl_WCHAR_H_DEFAULTS])
-
GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+ gl_MODULE_INDICATOR_SET_VARIABLE([$1])
dnl Define it also as a C macro, for the benefit of the unit tests.
gl_MODULE_INDICATOR([$1])
])
- macros factorization,
Bruno Haible <=