Branch :
- branch -
master
- tag -
CPPI-1_10
CPPI-1_8
CPPI-1_9
EMACS_20_2
EMACS_20_4
EMACS_21_1
EMACS_21_3
EMACS_PRETEST_21_0_103
EMACS_PRETEST_21_0_95
EMACS_PRETEST_21_2_93
FILEUTILS-3_10
FILEUTILS-3_11
FILEUTILS-3_12
FILEUTILS-3_12a
FILEUTILS-3_12f
FILEUTILS-3_12g
FILEUTILS-3_12j
FILEUTILS-3_12l
FILEUTILS-3_12m
FILEUTILS-3_12r
FILEUTILS-3_12s
FILEUTILS-3_13
FILEUTILS-3_13c
FILEUTILS-3_13f
FILEUTILS-3_13g
FILEUTILS-3_13h
FILEUTILS-3_13j
FILEUTILS-3_13k
FILEUTILS-3_14b
FILEUTILS-3_16g
FILEUTILS-3_16h
FILEUTILS-3_16i
FILEUTILS-3_16j
FILEUTILS-3_16k
FILEUTILS-3_16l
FILEUTILS-3_16m
FILEUTILS-3_16n
FILEUTILS-3_16p
FILEUTILS-3_16q
FILEUTILS-3_16r
FILEUTILS-3_16s
FILEUTILS-3_16t
FILEUTILS-3_16u
FILEUTILS-3_16v
FILEUTILS-3_16w
FILEUTILS-3_16x
FILEUTILS-3_16z
FILEUTILS-3_4
FILEUTILS-3_4_1
FILEUTILS-3_4_6
FILEUTILS-3_4_7
FILEUTILS-3_4_8
FILEUTILS-3_5
FILEUTILS-3_5_2
FILEUTILS-3_5_4
FILEUTILS-3_5_5
FILEUTILS-3_8_1
FILEUTILS-3_8_2
FILEUTILS-3_8_3
FILEUTILS-3_8_3a
FILEUTILS-3_8_3b
FILEUTILS-3_8_3c
FILEUTILS-3_8_3d
FILEUTILS-3_8_4
FILEUTILS-3_8_4b
FILEUTILS-3_8_4f
FILEUTILS-3_8_4g
FILEUTILS-3_9
FILEUTILS-3_9a
FILEUTILS-3_9b
FILEUTILS-3_9c
FILEUTILS-3_9d
FILEUTILS-3_9e
FILEUTILS-3_9f
FILEUTILS-3_9h
FILEUTILS-3_9i
FILEUTILS-3_9j
FILEUTILS-3_9k
FILEUTILS-3_9o
FILEUTILS-3_9s
FILEUTILS-3_9t
FILEUTILS-3_9t1
FILEUTILS-3_9t3
FILEUTILS-3_9u
FILEUTILS-3_9u1
FILEUTILS-4_0
FILEUTILS-4_0-b2
FILEUTILS-4_0-b3
FILEUTILS-4_0-b4
FILEUTILS-4_0-b6
FILEUTILS-4_0-b7
FILEUTILS-4_0-pre1
FILEUTILS-4_0_27
FILEUTILS-4_0_28
FILEUTILS-4_0_29
FILEUTILS-4_0_30
FILEUTILS-4_0_31
FILEUTILS-4_0_32
FILEUTILS-4_0_33
FILEUTILS-4_0_34
FILEUTILS-4_0_35
FILEUTILS-4_0_36
FILEUTILS-4_0_37
FILEUTILS-4_0_38
FILEUTILS-4_0_39
FILEUTILS-4_0_41
FILEUTILS-4_0_42
FILEUTILS-4_0_43
FILEUTILS-4_0_45
FILEUTILS-4_0e
FILEUTILS-4_0f
FILEUTILS-4_0g
FILEUTILS-4_0i
FILEUTILS-4_0j-trial
FILEUTILS-4_0k
FILEUTILS-4_0l
FILEUTILS-4_0m
FILEUTILS-4_0q
FILEUTILS-4_0r
FILEUTILS-4_0s
FILEUTILS-4_0t
FILEUTILS-4_0u
FILEUTILS-4_0v
FILEUTILS-4_0w
FILEUTILS-4_0x
FILEUTILS-4_0y
FILEUTILS-4_0z
FILEUTILS-4_1-b1
FILEUTILS-4_1-b2
FILEUTILS-4_1-b3
FILEUTILS-4_1_1
FILEUTILS-4_1_2
FILEUTILS-4_1_3
FILEUTILS-4_1_4
FILEUTILS-4_1_5
FILEUTILS-4_1_6
FILEUTILS-4_1_7
FILEUTILS-4_1_8
FILEUTILS-4_1_9
RMAIL-MBOX-BASE
SH-UTILS-1_12a
SH-UTILS-1_12d
SH-UTILS-1_12f
SH-UTILS-1_12g
SH-UTILS-1_12o
SH-UTILS-1_12p
SH-UTILS-1_12r
SH-UTILS-1_12t
SH-UTILS-1_14
SH-UTILS-1_15
SH-UTILS-1_15a
SH-UTILS-1_16
SH-UTILS-1_16a
SH-UTILS-1_16b
SH-UTILS-1_16c
SH-UTILS-1_16d
SH-UTILS-1_16f
SH-UTILS-1_16h
SH-UTILS-1_16k
SH-UTILS-1_16m
SH-UTILS-2_0
SH-UTILS-2_0_11
SH-UTILS-2_0_12
SH-UTILS-2_0a
SH-UTILS-2_0b
SH-UTILS-2_0c
SH-UTILS-2_0d
SH-UTILS-2_0e
SH-UTILS-2_0f
SH-UTILS-2_0g
SH-UTILS-2_0h
SH-UTILS-2_0i
SH-UTILS-2_0j
SHELLUTILS-1_10
SHELLUTILS-1_10c
SHELLUTILS-1_10d
SHELLUTILS-1_10e
SHELLUTILS-1_10f
SHELLUTILS-1_10i
SHELLUTILS-1_10l
SHELLUTILS-1_10m
SHELLUTILS-1_10n
SHELLUTILS-1_10n1
SHELLUTILS-1_10n2
SHELLUTILS-1_10n3
SHELLUTILS-1_10n4
SHELLUTILS-1_10n5
SHELLUTILS-1_10q
SHELLUTILS-1_10u
SHELLUTILS-1_10x
SHELLUTILS-1_12
SHELLUTILS-1_8
SHELLUTILS-1_8_1
SHELLUTILS-1_8_1a
SHELLUTILS-1_8_1b
SHELLUTILS-1_8_1c
SHELLUTILS-1_8_1d
SHELLUTILS-1_8_1g
SHELLUTILS-1_8_1h
SHELLUTILS-1_8_1k
SHELLUTILS-1_9
SHELLUTILS-1_9_1
SHELLUTILS-1_9_2
SHELLUTILS-1_9_2a
SHELLUTILS-1_9_2b
SHELLUTILS-1_9_2e
SHELLUTILS-1_9_2g
SHELLUTILS-1_9_2i
SHELLUTILS-1_9_4
SHELLUTILS-1_9_4c
SHELLUTILS-1_9_4d
SHELLUTILS-1_9_4e
SHELLUTILS-1_9_4f
SHELLUTILS-1_9_4h
SHELLUTILS-1_9_4j
SHELLUTILS-1_9_4l
TEXTUTILS-1_10
TEXTUTILS-1_11
TEXTUTILS-1_11_1a
TEXTUTILS-1_11_1b
TEXTUTILS-1_11_4
TEXTUTILS-1_11_4b
TEXTUTILS-1_11_5
TEXTUTILS-1_11_5b
TEXTUTILS-1_11_d
TEXTUTILS-1_11_e
TEXTUTILS-1_11_f
TEXTUTILS-1_11_g
TEXTUTILS-1_12
TEXTUTILS-1_12a
TEXTUTILS-1_13
TEXTUTILS-1_13g
TEXTUTILS-1_13i
TEXTUTILS-1_13j
TEXTUTILS-1_14
TEXTUTILS-1_14a
TEXTUTILS-1_14b
TEXTUTILS-1_14c
TEXTUTILS-1_14d
TEXTUTILS-1_18
TEXTUTILS-1_18e
TEXTUTILS-1_19d
TEXTUTILS-1_19g
TEXTUTILS-1_19m
TEXTUTILS-1_19n
TEXTUTILS-1_19o
TEXTUTILS-1_19q
TEXTUTILS-1_19r
TEXTUTILS-1_20a
TEXTUTILS-1_20b
TEXTUTILS-1_21a
TEXTUTILS-1_22a
TEXTUTILS-1_22c
TEXTUTILS-1_22d
TEXTUTILS-1_22f
TEXTUTILS-1_22g
TEXTUTILS-1_22h
TEXTUTILS-1_22i
TEXTUTILS-1_22j
TEXTUTILS-1_22k
TEXTUTILS-1_22l
TEXTUTILS-1_22m
TEXTUTILS-1_22n
TEXTUTILS-1_22o
TEXTUTILS-1_22p
TEXTUTILS-1_22q
TEXTUTILS-1_3_2
TEXTUTILS-1_3_6
TEXTUTILS-1_4
TEXTUTILS-1_4_1
TEXTUTILS-1_4_3
TEXTUTILS-1_5_2
TEXTUTILS-1_6
TEXTUTILS-1_8
TEXTUTILS-1_8_1b
TEXTUTILS-1_8a
TEXTUTILS-1_8b
TEXTUTILS-1_8c
TEXTUTILS-1_8i
TEXTUTILS-1_9_1
TEXTUTILS-1_9_1d
TEXTUTILS-1_9_1e
TEXTUTILS-1_9_1f
TEXTUTILS-1_9_1g
TEXTUTILS-1_9_1h
TEXTUTILS-1_9_1i1
TEXTUTILS-1_9_1k
TEXTUTILS-2_0
TEXTUTILS-2_0_10
TEXTUTILS-2_0_12
TEXTUTILS-2_0_15
TEXTUTILS-2_0_16
TEXTUTILS-2_0_17
TEXTUTILS-2_0_18
TEXTUTILS-2_0_19
TEXTUTILS-2_0_20
TEXTUTILS-2_0_21
TEXTUTILS-2_0_8
TEXTUTILS-2_0_9
TEXTUTILS-2_0a
TEXTUTILS-2_0c
TEXTUTILS-2_0e
TEXTUTILS-2_0f
TEXTUTILS-2_0g
ctype-fix
cvs-readonly
emacs-unicode-base
getopt-macros
kfs_20030524_pre
lexbind-before-merge-20030404
merge-with-1_9_4k
post-jumbo-LFS
pre-getopt
pre-jumbo-LFS
pre-version
raeburn-tag-4-for-export
ss-940725-22h45
ss-950520-08h12-sync-tu
ss-950614-22h58-1_11_5a
static-0
textutils-1_12_1
v0.0
v0.1
v1.0
version-3_4_2-to-fsf
version-3_4_4-tentative
Show log
Commit
Author :
Bruno Haible
Date :
2021-04-11 21:25:54
Hash :
80a344e3
Message :
Support several gnulib-tool invocations under the same configure.ac.
Reported by Reuben Thomas <rrt@sc3d.org> in
<https://lists.gnu.org/archive/html/bug-gnulib/2021-04/msg00104.html>.
This is done by defining the Gnulib module indicator variables per
gnulib-tool invocation. So that a generated .h file is no longer
influenced by the set of modules used in other gnulib-tool invocations.
* gnulib-tool (func_compute_include_guard_prefix): Set
module_indicator_prefix.
(func_emit_lib_Makefile_am, func_emit_tests_Makefile_am): Use it to
modify $(GNULIB_*) variable references in the Automake snippets.
(func_emit_initmacro_start): Push macro definitions for GL_MACRO_PREFIX
and GL_MODULE_INDICATOR_PREFIX.
(func_emit_initmacro_end): Pop these macro definitions.
* pygnulib/GLConfig.py (GLConfig.getIncludeGuardPrefix): New method.
* pygnulib/GLEmiter.py (GLEmiter.initmacro_start): Push macro
definitions for GL_MACRO_PREFIX and GL_MODULE_INDICATOR_PREFIX.
(GLEmiter.initmacro_end): Pop these macro definitions.
(GLEmiter.lib_Makefile_am, GLEmiter.tests_Makefile_am): Use the module
indicator prefix to modify $(GNULIB_*) variable references in the
Automake snippets.
* m4/gnulib-common.m4 (gl_MODULE_INDICATOR_INIT_VARIABLE,
gl_MODULE_INDICATOR_SET_VARIABLE): Use the value of
GL_MODULE_INDICATOR_PREFIX.
* m4/arpa_inet_h.m4: Use new idiom for header files that contain
references to Gnulib module indicator variables:
- Define the main macro through AC_DEFUN_ONCE.
- Define a macro gl_*_H_REQUIRE_DEFAULTS that initializes the Gnulib
module indicator variables (each prefixed with
GL_MODULE_INDICATOR_PREFIX).
- Invoke this macro in the gl_*_MODULE_INDICATOR macro.
* m4/ctype.m4: Likewise.
* m4/dirent_h.m4: Likewise.
* m4/fcntl_h.m4: Likewise.
* m4/fnmatch_h.m4: Likewise.
* m4/glob_h.m4: Likewise.
* m4/iconv_h.m4: Likewise.
* m4/inttypes.m4: Likewise.
* m4/langinfo_h.m4: Likewise.
* m4/locale_h.m4: Likewise.
* m4/malloc_h.m4: Likewise.
* m4/math_h.m4: Likewise.
* m4/monetary_h.m4: Likewise.
* m4/netdb_h.m4: Likewise.
* m4/poll_h.m4: Likewise.
* m4/pthread_h.m4: Likewise.
* m4/pty_h.m4: Likewise.
* m4/sched_h.m4: Likewise.
* m4/search_h.m4: Likewise.
* m4/signal_h.m4: Likewise.
* m4/spawn_h.m4: Likewise.
* m4/stddef_h.m4: Likewise.
* m4/stdio_h.m4: Likewise.
* m4/stdlib_h.m4: Likewise.
* m4/string_h.m4: Likewise.
* m4/strings_h.m4: Likewise.
* m4/sys_file_h.m4: Likewise.
* m4/sys_ioctl_h.m4: Likewise.
* m4/sys_random_h.m4: Likewise.
* m4/sys_resource_h.m4: Likewise.
* m4/sys_select_h.m4: Likewise.
* m4/sys_socket_h.m4: Likewise.
* m4/sys_stat_h.m4: Likewise.
* m4/sys_time_h.m4: Likewise.
* m4/sys_times_h.m4: Likewise.
* m4/sys_types_h.m4: Likewise.
* m4/sys_uio_h.m4: Likewise.
* m4/sys_utsname_h.m4: Likewise.
* m4/sys_wait_h.m4: Likewise.
* m4/termios_h.m4: Likewise.
* m4/threads.m4: Likewise.
* m4/time_h.m4: Likewise.
* m4/uchar.m4: Likewise.
* m4/unistd_h.m4: Likewise.
* m4/utime_h.m4: Likewise.
* m4/wchar_h.m4: Likewise.
* m4/wctype_h.m4: Likewise.
* modules/arpa_inet (configure.ac): Invoke the macro
gl_*_H_REQUIRE_DEFAULTS explicitly.
* modules/ctype (configure.ac): Likewise.
* modules/dirent (configure.ac): Likewise.
* modules/fcntl-h (configure.ac): Likewise.
* modules/fnmatch-h (configure.ac): Likewise.
* modules/glob-h (configure.ac): Likewise.
* modules/iconv-h (configure.ac): Likewise.
* modules/inttypes-incomplete (configure.ac): Likewise.
* modules/langinfo (configure.ac): Likewise.
* modules/locale (configure.ac): Likewise.
* modules/malloc-h (configure.ac): Likewise.
* modules/math (configure.ac): Likewise.
* modules/monetary (configure.ac): Likewise.
* modules/netdb (configure.ac): Likewise.
* modules/poll-h (configure.ac): Likewise.
* modules/pthread-h (configure.ac): Likewise.
* modules/pty (configure.ac): Likewise.
* modules/sched (configure.ac): Likewise.
* modules/search (configure.ac): Likewise.
* modules/signal-h (configure.ac): Likewise.
* modules/spawn (configure.ac): Likewise.
* modules/stddef (configure.ac): Likewise.
* modules/stdio (configure.ac): Likewise.
* modules/stdlib (configure.ac): Likewise.
* modules/string (configure.ac): Likewise.
* modules/strings (configure.ac): Likewise.
* modules/sys_file (configure.ac): Likewise.
* modules/sys_ioctl (configure.ac): Likewise.
* modules/sys_random (configure.ac): Likewise.
* modules/sys_resource (configure.ac): Likewise.
* modules/sys_select (configure.ac): Likewise.
* modules/sys_socket (configure.ac): Likewise.
* modules/sys_stat (configure.ac): Likewise.
* modules/sys_time (configure.ac): Likewise.
* modules/sys_times (configure.ac): Likewise.
* modules/sys_types (configure.ac): Likewise.
* modules/sys_uio (configure.ac): Likewise.
* modules/sys_utsname (configure.ac): Likewise.
* modules/sys_wait (configure.ac): Likewise.
* modules/termios (configure.ac): Likewise.
* modules/threads-h (configure.ac): Likewise.
* modules/time (configure.ac): Likewise.
* modules/uchar (configure.ac): Likewise.
* modules/unistd (configure.ac): Likewise.
* modules/utime-h (configure.ac): Likewise.
* modules/wchar (configure.ac): Likewise.
* modules/wctype-h (configure.ac): Likewise.
* m4/af_alg.m4: Update after a macro name changed.
* m4/ctime.m4: Likewise.
* m4/explicit_bzero.m4: Likewise.
* m4/ffs.m4: Likewise.
* m4/ffsl.m4: Likewise.
* m4/ffsll.m4: Likewise.
* m4/flock.m4: Likewise.
* m4/fstat.m4: Likewise.
* m4/getaddrinfo.m4: Likewise.
* m4/getdomainname.m4: Likewise.
* m4/gettimeofday.m4: Likewise.
* m4/hostent.m4: Likewise.
* m4/ioctl.m4: Likewise.
* m4/localtime.m4: Likewise.
* m4/mbslen.m4: Likewise.
* m4/memchr.m4: Likewise.
* m4/memmem.m4: Likewise.
* m4/mempcpy.m4: Likewise.
* m4/memrchr.m4: Likewise.
* m4/mktime.m4: Likewise.
* m4/nanosleep.m4: Likewise.
* m4/passfd.m4: Likewise.
* m4/pselect.m4: Likewise.
* m4/rawmemchr.m4: Likewise.
* m4/select.m4: Likewise.
* m4/servent.m4: Likewise.
* m4/sigabbrev_np.m4: Likewise.
* m4/sigdescr_np.m4: Likewise.
* m4/sockpfaf.m4: Likewise.
* m4/stat.m4: Likewise.
* m4/stpcpy.m4: Likewise.
* m4/stpncpy.m4: Likewise.
* m4/strcase.m4: Likewise.
* m4/strcasestr.m4: Likewise.
* m4/strchrnul.m4: Likewise.
* m4/strdup.m4: Likewise.
* m4/strerror.m4: Likewise.
* m4/strerror_r.m4: Likewise.
* m4/strerrorname_np.m4: Likewise.
* m4/strftime-fixes.m4: Likewise.
* m4/strncat.m4: Likewise.
* m4/strndup.m4: Likewise.
* m4/strnlen.m4: Likewise.
* m4/strpbrk.m4: Likewise.
* m4/strptime.m4: Likewise.
* m4/strsep.m4: Likewise.
* m4/strsignal.m4: Likewise.
* m4/strstr.m4: Likewise.
* m4/strtok_r.m4: Likewise.
* m4/strverscmp.m4: Likewise.
* m4/time_r.m4: Likewise.
* m4/time_rz.m4: Likewise.
* m4/timegm.m4: Likewise.
* m4/timespec_get.m4: Likewise.
* m4/tzset.m4: Likewise.
* modules/accept (configure.ac): Likewise.
* modules/bind (configure.ac): Likewise.
* modules/connect (configure.ac): Likewise.
* modules/flock (configure.ac): Likewise.
* modules/getpeername (configure.ac): Likewise.
* modules/getsockname (configure.ac): Likewise.
* modules/getsockopt (configure.ac): Likewise.
* modules/listen (configure.ac): Likewise.
* modules/recv (configure.ac): Likewise.
* modules/recvfrom (configure.ac): Likewise.
* modules/send (configure.ac): Likewise.
* modules/sendto (configure.ac): Likewise.
* modules/setsockopt (configure.ac): Likewise.
* modules/shutdown (configure.ac): Likewise.
* modules/socket (configure.ac): Likewise. Use the
gl_*_H_REQUIRE_DEFAULTS macros.
* modules/nonblocking (configure.ac): Use the gl_*_H_REQUIRE_DEFAULTS
and gl_MODULE_INDICATOR_INIT_VARIABLE macros.
* modules/sigpipe (configure.ac): Likewise.
* modules/windows-stat-override (configure.ac): Likewise.
* m4/nonblocking.m4: Update a comment.
* m4/sigpipe.m4: Likewise.