diff options
| author | Paul Eggert | 2024-05-11 13:16:48 -0700 |
|---|---|---|
| committer | Paul Eggert | 2024-05-11 18:46:26 -0700 |
| commit | 7ae091d933b03d0a1e1e0b39a949c2811c4c3618 (patch) | |
| tree | 6c4f1fbbbc86621d3e4320a9bcceab901c1b6d68 /lib/gnulib.mk.in | |
| parent | 2e13c2adbad4fc609f560926f6e536b25281f925 (diff) | |
| download | emacs-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.in | 23 |
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@ | |||
| 618 | GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ | 618 | GL_GNULIB_STRSIGNAL = @GL_GNULIB_STRSIGNAL@ |
| 619 | GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ | 619 | GL_GNULIB_STRSTR = @GL_GNULIB_STRSTR@ |
| 620 | GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ | 620 | GL_GNULIB_STRTOD = @GL_GNULIB_STRTOD@ |
| 621 | GL_GNULIB_STRTOF = @GL_GNULIB_STRTOF@ | ||
| 621 | GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ | 622 | GL_GNULIB_STRTOIMAX = @GL_GNULIB_STRTOIMAX@ |
| 622 | GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ | 623 | GL_GNULIB_STRTOK_R = @GL_GNULIB_STRTOK_R@ |
| 623 | GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ | 624 | GL_GNULIB_STRTOL = @GL_GNULIB_STRTOL@ |
| @@ -809,6 +810,7 @@ HAVE_MKSTEMPS = @HAVE_MKSTEMPS@ | |||
| 809 | HAVE_MODULES = @HAVE_MODULES@ | 810 | HAVE_MODULES = @HAVE_MODULES@ |
| 810 | HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ | 811 | HAVE_NANOSLEEP = @HAVE_NANOSLEEP@ |
| 811 | HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ | 812 | HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@ |
| 813 | HAVE_OFF64_T = @HAVE_OFF64_T@ | ||
| 812 | HAVE_OPENAT = @HAVE_OPENAT@ | 814 | HAVE_OPENAT = @HAVE_OPENAT@ |
| 813 | HAVE_OPENDIR = @HAVE_OPENDIR@ | 815 | HAVE_OPENDIR = @HAVE_OPENDIR@ |
| 814 | HAVE_OS_H = @HAVE_OS_H@ | 816 | HAVE_OS_H = @HAVE_OS_H@ |
| @@ -872,6 +874,7 @@ HAVE_STRPBRK = @HAVE_STRPBRK@ | |||
| 872 | HAVE_STRPTIME = @HAVE_STRPTIME@ | 874 | HAVE_STRPTIME = @HAVE_STRPTIME@ |
| 873 | HAVE_STRSEP = @HAVE_STRSEP@ | 875 | HAVE_STRSEP = @HAVE_STRSEP@ |
| 874 | HAVE_STRTOD = @HAVE_STRTOD@ | 876 | HAVE_STRTOD = @HAVE_STRTOD@ |
| 877 | HAVE_STRTOF = @HAVE_STRTOF@ | ||
| 875 | HAVE_STRTOL = @HAVE_STRTOL@ | 878 | HAVE_STRTOL = @HAVE_STRTOL@ |
| 876 | HAVE_STRTOLD = @HAVE_STRTOLD@ | 879 | HAVE_STRTOLD = @HAVE_STRTOLD@ |
| 877 | HAVE_STRTOLL = @HAVE_STRTOLL@ | 880 | HAVE_STRTOLL = @HAVE_STRTOLL@ |
| @@ -922,12 +925,10 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ | |||
| 922 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ | 925 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
| 923 | INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ | 926 | INT32_MAX_LT_INTMAX_MAX = @INT32_MAX_LT_INTMAX_MAX@ |
| 924 | INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ | 927 | INT64_MAX_EQ_LONG_MAX = @INT64_MAX_EQ_LONG_MAX@ |
| 928 | IS_D8_R8 = @IS_D8_R8@ | ||
| 925 | JARSIGNER = @JARSIGNER@ | 929 | JARSIGNER = @JARSIGNER@ |
| 926 | JAVAC = @JAVAC@ | 930 | JAVAC = @JAVAC@ |
| 927 | JPEG_CFLAGS = @JPEG_CFLAGS@ | 931 | JPEG_CFLAGS = @JPEG_CFLAGS@ |
| 928 | JSON_CFLAGS = @JSON_CFLAGS@ | ||
| 929 | JSON_LIBS = @JSON_LIBS@ | ||
| 930 | JSON_OBJ = @JSON_OBJ@ | ||
| 931 | KQUEUE_CFLAGS = @KQUEUE_CFLAGS@ | 932 | KQUEUE_CFLAGS = @KQUEUE_CFLAGS@ |
| 932 | KQUEUE_LIBS = @KQUEUE_LIBS@ | 933 | KQUEUE_LIBS = @KQUEUE_LIBS@ |
| 933 | KRB4LIB = @KRB4LIB@ | 934 | KRB4LIB = @KRB4LIB@ |
| @@ -1017,9 +1018,12 @@ NDK_BUILD_ARCH = @NDK_BUILD_ARCH@ | |||
| 1017 | NDK_BUILD_CC = @NDK_BUILD_CC@ | 1018 | NDK_BUILD_CC = @NDK_BUILD_CC@ |
| 1018 | NDK_BUILD_CFLAGS = @NDK_BUILD_CFLAGS@ | 1019 | NDK_BUILD_CFLAGS = @NDK_BUILD_CFLAGS@ |
| 1019 | NDK_BUILD_CXX = @NDK_BUILD_CXX@ | 1020 | NDK_BUILD_CXX = @NDK_BUILD_CXX@ |
| 1021 | NDK_BUILD_CXX_LDFLAGS = @NDK_BUILD_CXX_LDFLAGS@ | ||
| 1020 | NDK_BUILD_CXX_SHARED = @NDK_BUILD_CXX_SHARED@ | 1022 | NDK_BUILD_CXX_SHARED = @NDK_BUILD_CXX_SHARED@ |
| 1023 | NDK_BUILD_CXX_STL = @NDK_BUILD_CXX_STL@ | ||
| 1021 | NDK_BUILD_MODULES = @NDK_BUILD_MODULES@ | 1024 | NDK_BUILD_MODULES = @NDK_BUILD_MODULES@ |
| 1022 | NDK_BUILD_NASM = @NDK_BUILD_NASM@ | 1025 | NDK_BUILD_NASM = @NDK_BUILD_NASM@ |
| 1026 | NDK_BUILD_READELF = @NDK_BUILD_READELF@ | ||
| 1023 | NDK_BUILD_SDK = @NDK_BUILD_SDK@ | 1027 | NDK_BUILD_SDK = @NDK_BUILD_SDK@ |
| 1024 | NEXT_ASSERT_H = @NEXT_ASSERT_H@ | 1028 | NEXT_ASSERT_H = @NEXT_ASSERT_H@ |
| 1025 | NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ | 1029 | NEXT_AS_FIRST_DIRECTIVE_ASSERT_H = @NEXT_AS_FIRST_DIRECTIVE_ASSERT_H@ |
| @@ -1068,6 +1072,7 @@ NS_OBJ = @NS_OBJ@ | |||
| 1068 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ | 1072 | NS_OBJC_OBJ = @NS_OBJC_OBJ@ |
| 1069 | NTDIR = @NTDIR@ | 1073 | NTDIR = @NTDIR@ |
| 1070 | NTLIB = @NTLIB@ | 1074 | NTLIB = @NTLIB@ |
| 1075 | NULLPTR_T_NEEDS_STDDEF = @NULLPTR_T_NEEDS_STDDEF@ | ||
| 1071 | OBJC = @OBJC@ | 1076 | OBJC = @OBJC@ |
| 1072 | OBJCFLAGS = @OBJCFLAGS@ | 1077 | OBJCFLAGS = @OBJCFLAGS@ |
| 1073 | OBJEXT = @OBJEXT@ | 1078 | OBJEXT = @OBJEXT@ |
| @@ -1101,6 +1106,7 @@ PTRDIFF_T_SUFFIX = @PTRDIFF_T_SUFFIX@ | |||
| 1101 | QCOPY_ACL_LIB = @QCOPY_ACL_LIB@ | 1106 | QCOPY_ACL_LIB = @QCOPY_ACL_LIB@ |
| 1102 | RALLOC_OBJ = @RALLOC_OBJ@ | 1107 | RALLOC_OBJ = @RALLOC_OBJ@ |
| 1103 | RANLIB = @RANLIB@ | 1108 | RANLIB = @RANLIB@ |
| 1109 | READELF = @READELF@ | ||
| 1104 | REPLACE_ACCESS = @REPLACE_ACCESS@ | 1110 | REPLACE_ACCESS = @REPLACE_ACCESS@ |
| 1105 | REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ | 1111 | REPLACE_ALIGNED_ALLOC = @REPLACE_ALIGNED_ALLOC@ |
| 1106 | REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ | 1112 | REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ |
| @@ -1258,6 +1264,7 @@ REPLACE_STRNLEN = @REPLACE_STRNLEN@ | |||
| 1258 | REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ | 1264 | REPLACE_STRSIGNAL = @REPLACE_STRSIGNAL@ |
| 1259 | REPLACE_STRSTR = @REPLACE_STRSTR@ | 1265 | REPLACE_STRSTR = @REPLACE_STRSTR@ |
| 1260 | REPLACE_STRTOD = @REPLACE_STRTOD@ | 1266 | REPLACE_STRTOD = @REPLACE_STRTOD@ |
| 1267 | REPLACE_STRTOF = @REPLACE_STRTOF@ | ||
| 1261 | REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ | 1268 | REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ |
| 1262 | REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ | 1269 | REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ |
| 1263 | REPLACE_STRTOL = @REPLACE_STRTOL@ | 1270 | REPLACE_STRTOL = @REPLACE_STRTOL@ |
| @@ -1308,6 +1315,7 @@ SQLITE3_CFLAGS = @SQLITE3_CFLAGS@ | |||
| 1308 | SQLITE3_LIBS = @SQLITE3_LIBS@ | 1315 | SQLITE3_LIBS = @SQLITE3_LIBS@ |
| 1309 | STDCKDINT_H = @STDCKDINT_H@ | 1316 | STDCKDINT_H = @STDCKDINT_H@ |
| 1310 | STDDEF_H = @STDDEF_H@ | 1317 | STDDEF_H = @STDDEF_H@ |
| 1318 | STDDEF_NOT_IDEMPOTENT = @STDDEF_NOT_IDEMPOTENT@ | ||
| 1311 | STDINT_H = @STDINT_H@ | 1319 | STDINT_H = @STDINT_H@ |
| 1312 | SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ | 1320 | SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ |
| 1313 | SYSTEM_TYPE = @SYSTEM_TYPE@ | 1321 | SYSTEM_TYPE = @SYSTEM_TYPE@ |
| @@ -2195,6 +2203,7 @@ SED_HEADER_STDOUT = sed -e 1h -e '1$(SED_HEADER_NOEDIT)' -e 1G | |||
| 2195 | SED_HEADER_TO_AT_t = $(SED_HEADER_STDOUT) -n -e 'w $@-t' | 2203 | SED_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. | ||
| 2198 | gl_V_at = $(AM_V_GEN) | 2207 | gl_V_at = $(AM_V_GEN) |
| 2199 | 2208 | ||
| 2200 | endif | 2209 | endif |
| @@ -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 $@ |
| 3086 | else | 3097 | else |
| @@ -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 $@ |