diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-03-24 08:40:05 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-03-26 07:10:03 +0100 |
| commit | 9fa53f1a1bde42381c10d14b5b246420683733b1 (patch) | |
| tree | 31950181f1d6f06b5b5795997c958b7ece0d0667 /src/Makefile.am | |
| parent | 58c2e11a8b6849c4c602470fcc2466d0586a4d6f (diff) | |
| download | grep-9fa53f1a1bde42381c10d14b5b246420683733b1.tar.gz | |
build: do not use pkg-config to test for PCRE support
* configure.ac: Do not use PKG_PROG_PKG_CONFIG or PKG_CHECK_MODULES.
Do not modify CPPFLAGS; that belongs to those who invoke make.
Instead, use autoconf's AC_CHECK_HEADERS and AC_SEARCH_LIBS via the
new macro, gl_FUNC_PCRE, defined in...
* m4/pcre.m4 (gl_FUNC_PCRE): New macro, to handle pcre-related
configure-time tests.
* src/Makefile.am (grep_LDADD): Use LIB_PCRE, not PCRE_LIBS.
* src/pcresearch.c: Test HAVE_LIBPCRE via "#if", not "#ifdef".
All other cpp tests of this symbol used "#if".
Prompted by a suggestion from Bruno Haible.
* NEWS (Build-related): Mention this.
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 08f7aacf..a5d8ecaa 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -35,7 +35,7 @@ libgrep_a_SOURCES = kwset.c dfa.c searchutils.c dfasearch.c kwsearch.c \ # replacement functions defined in libgreputils.a. LDADD = libgrep.a ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a -grep_LDADD = $(LDADD) $(PCRE_LIBS) +grep_LDADD = $(LDADD) $(LIB_PCRE) localedir = $(datadir)/locale INCLUDES = -I$(top_srcdir)/lib -DLOCALEDIR=\"$(localedir)\" |