>From f81e7eac08e2af16fa6b8d245525c4a5ac5eb6f7 Mon Sep 17 00:00:00 2001
From: Nathan Kinder <nkinder@xxxxxxxxxx>
Date: Tue, 9 Feb 2010 12:21:34 -0800
Subject: [PATCH] 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.
---
configure | 7 ++++++-
m4/pcre.m4 | 7 ++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
mode change 100644 => 100755 Makefile.in
mode change 100644 => 100755 aclocal.m4
mode change 100644 => 100755 ltmain.sh
diff --git a/Makefile.in b/Makefile.in
old mode 100644
new mode 100755
diff --git a/aclocal.m4 b/aclocal.m4
old mode 100644
new mode 100755
diff --git a/configure b/configure
index e9647c2..4b6db2d 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
old mode 100644
new mode 100755
diff --git a/m4/pcre.m4 b/m4/pcre.m4
index 6096108..0c7569d 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)'
--
1.6.2.5
--
389-devel mailing list
389-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/389-devel
