diff options
| -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 |