aboutsummaryrefslogtreecommitdiffstats
path: root/lib/gnulib.mk.in
diff options
context:
space:
mode:
authorPaul Eggert2024-05-11 13:16:48 -0700
committerPaul Eggert2024-05-11 18:46:26 -0700
commit7ae091d933b03d0a1e1e0b39a949c2811c4c3618 (patch)
tree6c4f1fbbbc86621d3e4320a9bcceab901c1b6d68 /lib/gnulib.mk.in
parent2e13c2adbad4fc609f560926f6e536b25281f925 (diff)
downloademacs-7ae091d933b03d0a1e1e0b39a949c2811c4c3618.tar.gz
emacs-7ae091d933b03d0a1e1e0b39a949c2811c4c3618.zip
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/gnulib.mk.in')
-rw-r--r--lib/gnulib.mk.in23
1 files changed, 19 insertions, 4 deletions
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 711ddcf1260..a5c009cfb85 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -618,6 +618,7 @@ GL_GNULIB_STRSEP = @GL_GNULIB_STRSEP@
618GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ 618GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@
619GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ 619GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@
620GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ 620GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@
621GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@
621GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ 622GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@
622GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ 623GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@
623GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ 624GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@
@@ -809,6 +810,7 @@ HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
809HAVE_MODULES = @HAVE_MODULES@ 810HAVE_MODULES = @HAVE_MODULES@
810HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ 811HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
811HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ 812HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
813HAVE_OFF64_T = @HAVE_OFF64_T@
812HAVE_OPENAT = @HAVE_OPENAT@ 814HAVE_OPENAT = @HAVE_OPENAT@
813HAVE_OPENDIR = @HAVE_OPENDIR@ 815HAVE_OPENDIR = @HAVE_OPENDIR@
814HAVE_OS_H = @HAVE_OS_H@ 816HAVE_OS_H = @HAVE_OS_H@
@@ -872,6 +874,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@
872HAVE_STRPTIME = @HAVE_STRPTIME@ 874HAVE_STRPTIME = @HAVE_STRPTIME@
873HAVE_STRSEP = @HAVE_STRSEP@ 875HAVE_STRSEP = @HAVE_STRSEP@
874HAVE_STRTOD = @HAVE_STRTOD@ 876HAVE_STRTOD = @HAVE_STRTOD@
877HAVE_STRTOF = @HAVE_STRTOF@
875HAVE_STRTOL = @HAVE_STRTOL@ 878HAVE_STRTOL = @HAVE_STRTOL@
876HAVE_STRTOLD = @HAVE_STRTOLD@ 879HAVE_STRTOLD = @HAVE_STRTOLD@
877HAVE_STRTOLL = @HAVE_STRTOLL@ 880HAVE_STRTOLL = @HAVE_STRTOLL@
@@ -922,12 +925,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
922INSTALL_SCRIPT = @INSTALL_SCRIPT@ 925INSTALL_SCRIPT = @INSTALL_SCRIPT@
923INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ 926INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@
924INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ 927INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@
928IS_D8_R8 = @IS_D8_R8@
925JARSIGNER = @JARSIGNER@ 929JARSIGNER = @JARSIGNER@
926JAVAC = @JAVAC@ 930JAVAC = @JAVAC@
927JPEG_CFLAGS = @JPEG_CFLAGS@ 931JPEG_CFLAGS = @JPEG_CFLAGS@
928JSON_CFLAGS = @JSON_CFLAGS@
929JSON_LIBS = @JSON_LIBS@
930JSON_OBJ = @JSON_OBJ@
931KQUEUE_CFLAGS = @KQUEUE_CFLAGS@ 932KQUEUE_CFLAGS = @KQUEUE_CFLAGS@
932KQUEUE_LIBS = @KQUEUE_LIBS@ 933KQUEUE_LIBS = @KQUEUE_LIBS@
933KRB4LIB = @KRB4LIB@ 934KRB4LIB = @KRB4LIB@
@@ -1017,9 +1018,12 @@ NDK_BUILD_ARCH = @NDK_BUILD_ARCH@
1017NDK_BUILD_CC = @NDK_BUILD_CC@ 1018NDK_BUILD_CC = @NDK_BUILD_CC@
1018NDK_BUILD_CFLAGS = @NDK_BUILD_CFLAGS@ 1019NDK_BUILD_CFLAGS = @NDK_BUILD_CFLAGS@
1019NDK_BUILD_CXX = @NDK_BUILD_CXX@ 1020NDK_BUILD_CXX = @NDK_BUILD_CXX@
1021NDK_BUILD_CXX_LDFLAGS = @NDK_BUILD_CXX_LDFLAGS@
1020NDK_BUILD_CXX_SHARED = @NDK_BUILD_CXX_SHARED@ 1022NDK_BUILD_CXX_SHARED = @NDK_BUILD_CXX_SHARED@
1023NDK_BUILD_CXX_STL = @NDK_BUILD_CXX_STL@
1021NDK_BUILD_MODULES = @NDK_BUILD_MODULES@ 1024NDK_BUILD_MODULES = @NDK_BUILD_MODULES@
1022NDK_BUILD_NASM = @NDK_BUILD_NASM@ 1025NDK_BUILD_NASM = @NDK_BUILD_NASM@
1026NDK_BUILD_READELF = @NDK_BUILD_READELF@
1023NDK_BUILD_SDK = @NDK_BUILD_SDK@ 1027NDK_BUILD_SDK = @NDK_BUILD_SDK@
1024NEXT_ASSERT_H = @NEXT_ASSERT_H@ 1028NEXT_ASSERT_H = @NEXT_ASSERT_H@
1025NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ 1029NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@
@@ -1068,6 +1072,7 @@ NS_OBJ = @NS_OBJ@
1068NS_OBJC_OBJ = @NS_OBJC_OBJ@ 1072NS_OBJC_OBJ = @NS_OBJC_OBJ@
1069NTDIR = @NTDIR@ 1073NTDIR = @NTDIR@
1070NTLIB = @NTLIB@ 1074NTLIB = @NTLIB@
1075NULLPTR_T_NEEDS_STDDEF = @NULLPTR_T_NEEDS_STDDEF@
1071OBJC = @OBJC@ 1076OBJC = @OBJC@
1072OBJCFLAGS = @OBJCFLAGS@ 1077OBJCFLAGS = @OBJCFLAGS@
1073OBJEXT = @OBJEXT@ 1078OBJEXT = @OBJEXT@
@@ -1101,6 +1106,7 @@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@
1101QCOPY_ACL_LIB = @QCOPY_ACL_LIB@ 1106QCOPY_ACL_LIB = @QCOPY_ACL_LIB@
1102RALLOC_OBJ = @RALLOC_OBJ@ 1107RALLOC_OBJ = @RALLOC_OBJ@
1103RANLIB = @RANLIB@ 1108RANLIB = @RANLIB@
1109READELF = @READELF@
1104REPLACE_ACCESS = @REPLACE_ACCESS@ 1110REPLACE_ACCESS = @REPLACE_ACCESS@
1105REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ 1111REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@
1106REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ 1112REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@
@@ -1258,6 +1264,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@
1258REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ 1264REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@
1259REPLACE_STRSTR = @REPLACE_STRSTR@ 1265REPLACE_STRSTR = @REPLACE_STRSTR@
1260REPLACE_STRTOD = @REPLACE_STRTOD@ 1266REPLACE_STRTOD = @REPLACE_STRTOD@
1267REPLACE_STRTOF = @REPLACE_STRTOF@
1261REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ 1268REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@
1262REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ 1269REPLACE_STRTOK_R = @REPLACE_STRTOK_R@
1263REPLACE_STRTOL = @REPLACE_STRTOL@ 1270REPLACE_STRTOL = @REPLACE_STRTOL@
@@ -1308,6 +1315,7 @@ SQLITE3_CFLAGS = @SQLITE3_CFLAGS@
1308SQLITE3_LIBS = @SQLITE3_LIBS@ 1315SQLITE3_LIBS = @SQLITE3_LIBS@
1309STDCKDINT_H = @STDCKDINT_H@ 1316STDCKDINT_H = @STDCKDINT_H@
1310STDDEF_H = @STDDEF_H@ 1317STDDEF_H = @STDDEF_H@
1318STDDEF_NOT_IDEMPOTENT = @STDDEF_NOT_IDEMPOTENT@
1311STDINT_H = @STDINT_H@ 1319STDINT_H = @STDINT_H@
1312SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ 1320SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
1313SYSTEM_TYPE = @SYSTEM_TYPE@ 1321SYSTEM_TYPE = @SYSTEM_TYPE@
@@ -2195,6 +2203,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G
2195SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' 2203SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t'
2196 2204
2197# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that 2205# Use $(gl_V_at) instead of $(AM_V_GEN) or $(AM_V_at) on a line that
2206# is its recipe's first line if and only if @NMD@ lines are absent.
2198gl_V_at = $(AM_V_GEN) 2207gl_V_at = $(AM_V_GEN)
2199 2208
2200endif 2209endif
@@ -3078,9 +3087,11 @@ stddef.h: stddef.in.h $(top_builddir)/config.status
3078 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ 3087 -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
3079 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ 3088 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
3080 -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ 3089 -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
3090 -e 's|@''NULLPTR_T_NEEDS_STDDEF''@|$(NULLPTR_T_NEEDS_STDDEF)|g' \
3091 -e 's|@''STDDEF_NOT_IDEMPOTENT''@|$(STDDEF_NOT_IDEMPOTENT)|g' \
3092 -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
3081 -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \ 3093 -e 's|@''HAVE_MAX_ALIGN_T''@|$(HAVE_MAX_ALIGN_T)|g' \
3082 -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ 3094 -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
3083 -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
3084 $(srcdir)/stddef.in.h > $@-t 3095 $(srcdir)/stddef.in.h > $@-t
3085 $(AM_V_at)mv $@-t $@ 3096 $(AM_V_at)mv $@-t $@
3086else 3097else
@@ -3347,6 +3358,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
3347 -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \ 3358 -e 's/@''GNULIB_SECURE_GETENV''@/$(GL_GNULIB_SECURE_GETENV)/g' \
3348 -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \ 3359 -e 's/@''GNULIB_SETENV''@/$(GL_GNULIB_SETENV)/g' \
3349 -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \ 3360 -e 's/@''GNULIB_STRTOD''@/$(GL_GNULIB_STRTOD)/g' \
3361 -e 's/@''GNULIB_STRTOF''@/$(GL_GNULIB_STRTOF)/g' \
3350 -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \ 3362 -e 's/@''GNULIB_STRTOL''@/$(GL_GNULIB_STRTOL)/g' \
3351 -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \ 3363 -e 's/@''GNULIB_STRTOLD''@/$(GL_GNULIB_STRTOLD)/g' \
3352 -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \ 3364 -e 's/@''GNULIB_STRTOLL''@/$(GL_GNULIB_STRTOLL)/g' \
@@ -3399,6 +3411,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
3399 -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \ 3411 -e 's|@''HAVE_SETSTATE''@|$(HAVE_SETSTATE)|g' \
3400 -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \ 3412 -e 's|@''HAVE_DECL_SETSTATE''@|$(HAVE_DECL_SETSTATE)|g' \
3401 -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ 3413 -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
3414 -e 's|@''HAVE_STRTOF''@|$(HAVE_STRTOF)|g' \
3402 -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \ 3415 -e 's|@''HAVE_STRTOL''@|$(HAVE_STRTOL)|g' \
3403 -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \ 3416 -e 's|@''HAVE_STRTOLD''@|$(HAVE_STRTOLD)|g' \
3404 -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ 3417 -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
@@ -3444,6 +3457,7 @@ stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \
3444 -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ 3457 -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
3445 -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \ 3458 -e 's|@''REPLACE_SETSTATE''@|$(REPLACE_SETSTATE)|g' \
3446 -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ 3459 -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
3460 -e 's|@''REPLACE_STRTOF''@|$(REPLACE_STRTOF)|g' \
3447 -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \ 3461 -e 's|@''REPLACE_STRTOL''@|$(REPLACE_STRTOL)|g' \
3448 -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \ 3462 -e 's|@''REPLACE_STRTOLD''@|$(REPLACE_STRTOLD)|g' \
3449 -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \ 3463 -e 's|@''REPLACE_STRTOLL''@|$(REPLACE_STRTOLL)|g' \
@@ -3833,6 +3847,7 @@ sys/types.h: sys_types.in.h $(top_builddir)/config.status
3833 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ 3847 -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
3834 -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \ 3848 -e 's|@''NEXT_SYS_TYPES_H''@|$(NEXT_SYS_TYPES_H)|g' \
3835 -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ 3849 -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \
3850 -e 's|@''HAVE_OFF64_T''@|$(HAVE_OFF64_T)|g' \
3836 -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \ 3851 -e 's|@''WINDOWS_STAT_INODES''@|$(WINDOWS_STAT_INODES)|g' \
3837 $(srcdir)/sys_types.in.h > $@-t 3852 $(srcdir)/sys_types.in.h > $@-t
3838 $(AM_V_at)mv $@-t $@ 3853 $(AM_V_at)mv $@-t $@