diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-03-30 07:59:05 +0200 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-03-30 08:00:50 +0200 |
| commit | 4007d6ed26e0dbd22b5b5cd3914292e32ecd2028 (patch) | |
| tree | 8c2f29c8ea7e1898c1f9483a8468b50318dd503e | |
| parent | 2c20c9617a8f85ab58e0795fdf458917573e3935 (diff) | |
| download | grep-4007d6ed26e0dbd22b5b5cd3914292e32ecd2028.tar.gz | |
build: detect PCRE support also when <pcre/pcre.h> is the header
* m4/pcre.m4: Also check for <pcre/pcre.h>.
* src/pcresearch.c: Include <pcre/pcre.h>, if needed.
Guard inclusions with HAVE_PCRE_H and HAVE_PCRE_PCRE_H, not HAVE_LIBPCRE.
* NEWS (Bug fixes): Mention it.
Dmitry V. Levin reported that PCRE support was not detected
on systems with <pcre.h> not in the default include path.
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | m4/pcre.m4 | 4 | ||||
| -rw-r--r-- | src/pcresearch.c | 4 |
3 files changed, 11 insertions, 2 deletions
@@ -2,6 +2,11 @@ GNU grep NEWS -*- outline -*- * Noteworthy changes in release ?.? (????-??-??) [?] +** Bug fixes + + PCRE support is once again detected on systems with <pcre/pcre.h> + [bug introduced in 2.6.2] + * Noteworthy changes in release 2.6.2 (2010-03-29) [stable] @@ -23,7 +23,9 @@ AC_DEFUN([gl_FUNC_PCRE], if test x"$test_pcre" = x"yes"; then AC_CHECK_HEADERS([pcre.h]) - if test $ac_cv_header_pcre_h = yes; then + AC_CHECK_HEADERS([pcre/pcre.h]) + if test $ac_cv_header_pcre_h = yes \ + || test $ac_cv_header_pcre_pcre_h = yes; then pcre_saved_LIBS=$LIBS AC_SEARCH_LIBS([pcre_compile], [pcre], [test "$ac_cv_search_pcre_compile" = "none required" || diff --git a/src/pcresearch.c b/src/pcresearch.c index 6a82be28..795f4c4c 100644 --- a/src/pcresearch.c +++ b/src/pcresearch.c @@ -20,8 +20,10 @@ #include <config.h> #include "search.h" -#if HAVE_LIBPCRE +#if HAVE_PCRE_H # include <pcre.h> +#elif HAVE_PCRE_PCRE_H +# include <pcre/pcre.h> #endif #if HAVE_LIBPCRE |