diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-06 15:49:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-04-06 16:10:56 -0700 |
| commit | 936ae4a5e6c8fd27d86c2f9e0f46c61c8c15c4ff (patch) | |
| tree | 750e53c043e96311d6baf496401c269c714e2fe5 /src | |
| parent | ff38f097a41ddf908e3036524319de5a3aa6188e (diff) | |
| download | grep-936ae4a5e6c8fd27d86c2f9e0f46c61c8c15c4ff.tar.gz | |
build: use pkg-config (if available) to configure libpcre
Problem reported by Mike Frysinger in: http://bugs.gnu.org/16757
* bootstrap.conf (bootstrap_post_import_hook):
Copy pkg-config's pkg.m4.
* configure.ac: Invoke PKG_PROG_PKG_CONFIG.
* m4/pcre.m4 (gl_FUNC_PCRE): Rewrite to use pkg-config if
available, and to test that pcre_compile can be linked to.
* src/Makefile.am (AM_CFLAGS): Add PCRE_CFLAGS.
(grep_LDADD): Add PCRE_LIBS.
* src/pcresearch.c: Simply include <pcre.h> if HAVE_LIBPCRE,
since 'configure' arranges for the appropriate -I option now.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/pcresearch.c | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5c608dfb..ce81228e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -16,7 +16,7 @@ LN = ln -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) +AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PCRE_CFLAGS) # Tell the linker to omit references to unused shared libraries. AM_LDFLAGS = $(IGNORE_UNUSED_LIBRARIES_CFLAGS) @@ -38,7 +38,7 @@ LDADD = \ ../lib/libgreputils.a $(LIBINTL) ../lib/libgreputils.a $(LIBICONV) \ $(LIBTHREAD) -grep_LDADD = $(LDADD) $(LIB_PCRE) +grep_LDADD = $(LDADD) $(PCRE_LIBS) localedir = $(datadir)/locale AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib diff --git a/src/pcresearch.c b/src/pcresearch.c index afe4f2bd..c8e2dcfc 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -20,13 +20,9 @@ #include <config.h> #include "search.h" -#if HAVE_PCRE_H -# include <pcre.h> -#elif HAVE_PCRE_PCRE_H -# include <pcre/pcre.h> -#endif #if HAVE_LIBPCRE +# include <pcre.h> /* This must be at least 2; everything after that is for performance in pcre_exec. */ |