diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2020-04-03 08:30:08 +0200 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2020-04-03 08:30:08 +0200 |
| commit | ba247a114c75a84473c11c1484013b09fbb9bcd1 (patch) | |
| tree | a76cedce73621da0142ceb7d71ae51cad8696ec3 /tools/Makefile.am | |
| parent | scd:p15: Implement do_with_keygrip and capabilities. (diff) | |
| download | gnupg2-ba247a114c75a84473c11c1484013b09fbb9bcd1.tar.xz gnupg2-ba247a114c75a84473c11c1484013b09fbb9bcd1.zip | |
gpg: Add regular expression support.
* AUTHORS, COPYING.other: Update.
* Makefile.am (SUBDIRS): Add regexp sub directory.
* configure.ac (DISABLE_REGEX): Remove.
* g10/Makefile.am (needed_libs): Add libregexp.a.
* g10/trustdb.c: Remove DISABLE_REGEX support.
* regexp/LICENSE, regexp/jimregexp.c, regexp/jimregexp.h,
regexp/utf8.c, regexp/utf8.h: New from Jim Tcl.
* regexp/UnicodeData.txt: New from Unicode.
* regexp/Makefile.am, regexp/parse-unidata.awk: New.
* tests/openpgp/Makefile.am: Remove DISABLE_REGEX support.
* tools/Makefile.am: Remove DISABLE_REGEX support.
GnuPG-bug-id: 4843
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
Diffstat (limited to 'tools/Makefile.am')
| -rw-r--r-- | tools/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am index 9df9d4c46..878c249bc 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -56,9 +56,7 @@ if !HAVE_W32_SYSTEM bin_PROGRAMS += watchgnupg gpgparsemail ${gpg_wks_server} endif -if !DISABLE_REGEX libexec_PROGRAMS += gpg-check-pattern -endif if !HAVE_W32CE_SYSTEM noinst_PROGRAMS = clean-sat make-dns-cert gpgsplit @@ -92,6 +90,9 @@ if HAVE_W32CE_SYSTEM opt_libassuan_libs = $(LIBASSUAN_LIBS) endif +regexp_libs = ../regexp/libregexp.a + + gpgsplit_LDADD = $(common_libs) \ $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) @@ -140,13 +141,12 @@ gpg_card_LDADD = \ $(gpg_card_tool_rc_objs) -if !DISABLE_REGEX gpg_check_pattern_SOURCES = gpg-check-pattern.c gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV) -gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \ +gpg_check_pattern_LDADD = $(common_libs) $(regexp_libs) $(LIBGCRYPT_LIBS) \ + $(GPG_ERROR_LIBS) \ $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS) \ $(LIBICONV) -endif gpgtar_SOURCES = \ gpgtar.c gpgtar.h \ |