Improve search for pcre header file

Some platforms (RHEL4 for instance) put the pcre header file in
a pcre subdirectory under /usr/include.  This patch makes configure
first search in /usr/include/pcre, then falls back to /usr/include.

5 files changed, 12 insertions, 2 deletions

diff --git a/Makefile.in b/Makefile.in
index fc381a0d..fc381a0d 100644..100755
--- a/Makefile.in
+++ b/Makefile.in
diff --git a/aclocal.m4 b/aclocal.m4
index 2b62cd1e..2b62cd1e 100644..100755
--- a/aclocal.m4
+++ b/aclocal.m4
diff --git a/configure b/configure
index e9647c2d..4b6db2d2 100755
--- a/configure
+++ b/configure
@@ -27061,7 +27061,12 @@ if test "${with_pcre+set}" = set; then
   if test "$withval" = "yes"; then
     echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
-        if test -f "/usr/include/pcre.h"; then
+        if test -f "/usr/include/pcre/pcre.h"; then
+      pcre_incdir="/usr/include/pcre"
+      pcre_inc="-I/usr/include/pcre"
+      pcre_lib='-L$(libdir)'
+      pcre_libdir='$(libdir)'
+    elif test -f "/usr/include/pcre.h"; then
       pcre_incdir="/usr/include"
       pcre_inc="-I/usr/include"
       pcre_lib='-L$(libdir)'
diff --git a/ltmain.sh b/ltmain.sh
index 0223495a..0223495a 100644..100755
--- a/ltmain.sh
+++ b/ltmain.sh
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 6096108d..0c7569db 100644
--- a/m4/pcre.m4
+++ b/m4/pcre.m4
@@ -27,7 +27,12 @@ AC_ARG_WITH(pcre, [  --with-pcre=PATH   Perl Compatible Regular Expression direc
   if test "$withval" = "yes"; then
     AC_MSG_RESULT(yes)
     dnl - check in system locations
-    if test -f "/usr/include/pcre.h"; then
+    if test -f "/usr/include/pcre/pcre.h"; then
+      pcre_incdir="/usr/include/pcre"
+      pcre_inc="-I/usr/include/pcre"
+      pcre_lib='-L$(libdir)'
+      pcre_libdir='$(libdir)'
+    elif test -f "/usr/include/pcre.h"; then
       pcre_incdir="/usr/include"
       pcre_inc="-I/usr/include"
       pcre_lib='-L$(libdir)'