diff options
| author | Paul Eggert | 2018-10-15 00:55:37 -0500 |
|---|---|---|
| committer | Paul Eggert | 2018-10-15 00:57:57 -0500 |
| commit | 3d91dc1bb5aeecda786ebe1805c33d14c8bd89fa (patch) | |
| tree | 155498240a837b179319741542aaa78c8a47c9ab /m4 | |
| parent | 6b8fd34c4ab1aa23b180440cdc8210900896bbf4 (diff) | |
| download | emacs-3d91dc1bb5aeecda786ebe1805c33d14c8bd89fa.tar.gz emacs-3d91dc1bb5aeecda786ebe1805c33d14c8bd89fa.zip | |
Update lib/regex from glibc via Gnulib
This syncs recent refactorings from glibc, and incorporates:
2018-10-15 libc-config: merge from glibc
2018-10-15 regex: depend on libc-config
* .gitignore: Do not ignore m4/_*.m4.
* lib/cdefs.h: New file, copied from Gnulib.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/libc-config.h, m4/__inline.m4: New files, copied from Gnulib.
* lib/regcomp.c, lib/regex.c, lib/regex_internal.c:
* lib/regex_internal.h, lib/regexec.c:
Copy from glibc via Gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/__inline.m4 | 22 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 16 |
2 files changed, 38 insertions, 0 deletions
diff --git a/m4/__inline.m4 b/m4/__inline.m4 new file mode 100644 index 00000000000..3d0c4798997 --- /dev/null +++ b/m4/__inline.m4 | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | # Test for __inline keyword | ||
| 2 | dnl Copyright 2017-2018 Free Software Foundation, Inc. | ||
| 3 | dnl This file is free software; the Free Software Foundation | ||
| 4 | dnl gives unlimited permission to copy and/or distribute it, | ||
| 5 | dnl with or without modifications, as long as this notice is preserved. | ||
| 6 | |||
| 7 | AC_DEFUN([gl___INLINE], | ||
| 8 | [ | ||
| 9 | AC_CACHE_CHECK([whether the compiler supports the __inline keyword], | ||
| 10 | [gl_cv_c___inline], | ||
| 11 | [AC_COMPILE_IFELSE( | ||
| 12 | [AC_LANG_PROGRAM( | ||
| 13 | [[typedef int foo_t; | ||
| 14 | static __inline foo_t foo (void) { return 0; }]], | ||
| 15 | [[return foo ();]])], | ||
| 16 | [gl_cv_c___inline=yes], | ||
| 17 | [gl_cv_c___inline=no])]) | ||
| 18 | if test $gl_cv_c___inline = yes; then | ||
| 19 | AC_DEFINE([HAVE___INLINE], [1], | ||
| 20 | [Define to 1 if the compiler supports the keyword '__inline'.]) | ||
| 21 | fi | ||
| 22 | ]) | ||
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 61aabaa3427..74f28178ffc 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 | |||
| @@ -109,6 +109,7 @@ AC_DEFUN([gl_EARLY], | |||
| 109 | # Code from module inttypes-incomplete: | 109 | # Code from module inttypes-incomplete: |
| 110 | # Code from module largefile: | 110 | # Code from module largefile: |
| 111 | AC_REQUIRE([AC_SYS_LARGEFILE]) | 111 | AC_REQUIRE([AC_SYS_LARGEFILE]) |
| 112 | # Code from module libc-config: | ||
| 112 | # Code from module limits-h: | 113 | # Code from module limits-h: |
| 113 | # Code from module localtime-buffer: | 114 | # Code from module localtime-buffer: |
| 114 | # Code from module lstat: | 115 | # Code from module lstat: |
| @@ -441,6 +442,7 @@ AC_DEFUN([gl_INIT], | |||
| 441 | gl_gnulib_enabled_getgroups=false | 442 | gl_gnulib_enabled_getgroups=false |
| 442 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false | 443 | gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36=false |
| 443 | gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1=false | 444 | gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1=false |
| 445 | gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467=false | ||
| 444 | gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false | 446 | gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9=false |
| 445 | gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=false | 447 | gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31=false |
| 446 | gl_gnulib_enabled_open=false | 448 | gl_gnulib_enabled_open=false |
| @@ -554,6 +556,13 @@ AC_DEFUN([gl_INIT], | |||
| 554 | fi | 556 | fi |
| 555 | fi | 557 | fi |
| 556 | } | 558 | } |
| 559 | func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 () | ||
| 560 | { | ||
| 561 | if ! $gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467; then | ||
| 562 | gl___INLINE | ||
| 563 | gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467=true | ||
| 564 | fi | ||
| 565 | } | ||
| 557 | func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 () | 566 | func_gl_gnulib_m4code_2049e887c7e5308faad27b3f894bb8c9 () |
| 558 | { | 567 | { |
| 559 | if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then | 568 | if ! $gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9; then |
| @@ -669,6 +678,9 @@ AC_DEFUN([gl_INIT], | |||
| 669 | if test $ac_use_included_regex = yes; then | 678 | if test $ac_use_included_regex = yes; then |
| 670 | func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 | 679 | func_gl_gnulib_m4code_37f71b604aa9c54446783d80f42fe547 |
| 671 | fi | 680 | fi |
| 681 | if test $ac_use_included_regex = yes; then | ||
| 682 | func_gl_gnulib_m4code_21ee726a3540c09237a8e70c0baf7467 | ||
| 683 | fi | ||
| 672 | if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then | 684 | if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then |
| 673 | func_gl_gnulib_m4code_strtoll | 685 | func_gl_gnulib_m4code_strtoll |
| 674 | fi | 686 | fi |
| @@ -686,6 +698,7 @@ AC_DEFUN([gl_INIT], | |||
| 686 | AM_CONDITIONAL([gl_GNULIB_ENABLED_getgroups], [$gl_gnulib_enabled_getgroups]) | 698 | AM_CONDITIONAL([gl_GNULIB_ENABLED_getgroups], [$gl_gnulib_enabled_getgroups]) |
| 687 | AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) | 699 | AM_CONDITIONAL([gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36], [$gl_gnulib_enabled_be453cec5eecf5731a274f2de7f2db36]) |
| 688 | AM_CONDITIONAL([gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1], [$gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1]) | 700 | AM_CONDITIONAL([gl_GNULIB_ENABLED_a9786850e999ae65a836a6041e8e5ed1], [$gl_gnulib_enabled_a9786850e999ae65a836a6041e8e5ed1]) |
| 701 | AM_CONDITIONAL([gl_GNULIB_ENABLED_21ee726a3540c09237a8e70c0baf7467], [$gl_gnulib_enabled_21ee726a3540c09237a8e70c0baf7467]) | ||
| 689 | AM_CONDITIONAL([gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9], [$gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9]) | 702 | AM_CONDITIONAL([gl_GNULIB_ENABLED_2049e887c7e5308faad27b3f894bb8c9], [$gl_gnulib_enabled_2049e887c7e5308faad27b3f894bb8c9]) |
| 690 | AM_CONDITIONAL([gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31], [$gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31]) | 703 | AM_CONDITIONAL([gl_GNULIB_ENABLED_5264294aa0a5557541b53c8c741f7f31], [$gl_gnulib_enabled_5264294aa0a5557541b53c8c741f7f31]) |
| 691 | AM_CONDITIONAL([gl_GNULIB_ENABLED_open], [$gl_gnulib_enabled_open]) | 704 | AM_CONDITIONAL([gl_GNULIB_ENABLED_open], [$gl_gnulib_enabled_open]) |
| @@ -858,6 +871,7 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 858 | lib/c-strncasecmp.c | 871 | lib/c-strncasecmp.c |
| 859 | lib/careadlinkat.c | 872 | lib/careadlinkat.c |
| 860 | lib/careadlinkat.h | 873 | lib/careadlinkat.h |
| 874 | lib/cdefs.h | ||
| 861 | lib/cloexec.c | 875 | lib/cloexec.c |
| 862 | lib/cloexec.h | 876 | lib/cloexec.h |
| 863 | lib/close-stream.c | 877 | lib/close-stream.c |
| @@ -920,6 +934,7 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 920 | lib/ignore-value.h | 934 | lib/ignore-value.h |
| 921 | lib/intprops.h | 935 | lib/intprops.h |
| 922 | lib/inttypes.in.h | 936 | lib/inttypes.in.h |
| 937 | lib/libc-config.h | ||
| 923 | lib/limits.in.h | 938 | lib/limits.in.h |
| 924 | lib/localtime-buffer.c | 939 | lib/localtime-buffer.c |
| 925 | lib/localtime-buffer.h | 940 | lib/localtime-buffer.h |
| @@ -1002,6 +1017,7 @@ AC_DEFUN([gl_FILE_LIST], [ | |||
| 1002 | lib/warn-on-use.h | 1017 | lib/warn-on-use.h |
| 1003 | lib/xalloc-oversized.h | 1018 | lib/xalloc-oversized.h |
| 1004 | m4/00gnulib.m4 | 1019 | m4/00gnulib.m4 |
| 1020 | m4/__inline.m4 | ||
| 1005 | m4/absolute-header.m4 | 1021 | m4/absolute-header.m4 |
| 1006 | m4/acl.m4 | 1022 | m4/acl.m4 |
| 1007 | m4/alloca.m4 | 1023 | m4/alloca.m4 |