Use Gnulib regex for lib-src
Emacs regular expressions forked from everyone else long ago.
This makes it official and should allow simplification later.
etags.c now uses the glibc regex API, falling back on a
Gnulib-supplied substitute lib/regex.c if necessary.
Emacs proper now uses its own regular expression module.
Although this patch may look dauntingly large, most of it
was generated automatically by admin/merge-gnulib
and contains an exact copy of the glibc regex source,
and the by-hand changes do not grow the Emacs source code.
* admin/merge-gnulib (GNULIB_MODULES): Add regex.
(AVOIDED_MODULES): Add btowc, langinfo, lock, mbrtowc, mbsinit,
nl_langinfo, wchar, wcrtomb, wctype-h.
* lib-src/Makefile.in (regex-emacs.o): Remove; Gnulib does it now.
(etags_deps, etags_libs): Remove regex-emacs.o.
* lib-src/etags.c: Go back to including regex.h.
(add_regex): Use unsigned char translation array,
since glibc regex requires that.
* lib/Makefile.in (not_emacs_OBJECTS, for_emacs_OBJECTS): New macros.
(libegnu_a_OBJECTS): Use them, to avoid building e-regex.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/regcomp.c, lib/regex.c, lib/regex.h, lib/regex_internal.c:
* lib/regex_internal.h, lib/regexec.c, m4/builtin-expect.m4:
* m4/eealloc.m4, m4/glibc21.m4, m4/mbstate_t.m4, m4/regex.m4:
New files, copied from Gnulib.
* src/regex-emacs.h, src/conf_post.h:
(RE_TRANSLATE_TYPE, RE_TRANSLATE, RE_TRANSLATE_P):
Move from src/conf_post.h to src/regex-emacs.h,
so that they don’t interfere with compiling lib/regex.c.
2018-08-06 01:41:20 +00:00
|
|
|
# eealloc.m4 serial 3
|
2020-01-01 00:19:43 +00:00
|
|
|
dnl Copyright (C) 2003, 2009-2020 Free Software Foundation, Inc.
|
Use Gnulib regex for lib-src
Emacs regular expressions forked from everyone else long ago.
This makes it official and should allow simplification later.
etags.c now uses the glibc regex API, falling back on a
Gnulib-supplied substitute lib/regex.c if necessary.
Emacs proper now uses its own regular expression module.
Although this patch may look dauntingly large, most of it
was generated automatically by admin/merge-gnulib
and contains an exact copy of the glibc regex source,
and the by-hand changes do not grow the Emacs source code.
* admin/merge-gnulib (GNULIB_MODULES): Add regex.
(AVOIDED_MODULES): Add btowc, langinfo, lock, mbrtowc, mbsinit,
nl_langinfo, wchar, wcrtomb, wctype-h.
* lib-src/Makefile.in (regex-emacs.o): Remove; Gnulib does it now.
(etags_deps, etags_libs): Remove regex-emacs.o.
* lib-src/etags.c: Go back to including regex.h.
(add_regex): Use unsigned char translation array,
since glibc regex requires that.
* lib/Makefile.in (not_emacs_OBJECTS, for_emacs_OBJECTS): New macros.
(libegnu_a_OBJECTS): Use them, to avoid building e-regex.o.
* lib/gnulib.mk.in, m4/gnulib-comp.m4: Regenerate.
* lib/regcomp.c, lib/regex.c, lib/regex.h, lib/regex_internal.c:
* lib/regex_internal.h, lib/regexec.c, m4/builtin-expect.m4:
* m4/eealloc.m4, m4/glibc21.m4, m4/mbstate_t.m4, m4/regex.m4:
New files, copied from Gnulib.
* src/regex-emacs.h, src/conf_post.h:
(RE_TRANSLATE_TYPE, RE_TRANSLATE, RE_TRANSLATE_P):
Move from src/conf_post.h to src/regex-emacs.h,
so that they don’t interfere with compiling lib/regex.c.
2018-08-06 01:41:20 +00:00
|
|
|
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.
|
|
|
|
|
|
|
|
|
|
AC_DEFUN([gl_EEALLOC],
|
|
|
|
|
[
|
|
|
|
|
AC_REQUIRE([gl_EEMALLOC])
|
|
|
|
|
AC_REQUIRE([gl_EEREALLOC])
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
AC_DEFUN([gl_EEMALLOC],
|
|
|
|
|
[
|
|
|
|
|
_AC_FUNC_MALLOC_IF(
|
|
|
|
|
[gl_cv_func_malloc_0_nonnull=1],
|
|
|
|
|
[gl_cv_func_malloc_0_nonnull=0])
|
|
|
|
|
AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull],
|
|
|
|
|
[If malloc(0) is != NULL, define this to 1. Otherwise define this
|
|
|
|
|
to 0.])
|
|
|
|
|
])
|
|
|
|
|
|
|
|
|
|
AC_DEFUN([gl_EEREALLOC],
|
|
|
|
|
[
|
|
|
|
|
_AC_FUNC_REALLOC_IF(
|
|
|
|
|
[gl_cv_func_realloc_0_nonnull=1],
|
|
|
|
|
[gl_cv_func_realloc_0_nonnull=0])
|
|
|
|
|
AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull],
|
|
|
|
|
[If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this
|
|
|
|
|
to 0.])
|
|
|
|
|
])
|