From 4007d6ed26e0dbd22b5b5cd3914292e32ecd2028 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 30 Mar 2010 07:59:05 +0200
Subject: 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.
---
 m4/pcre.m4 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 001806e0..3fc931e5 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -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" ||
-- 
cgit v1.2.1