diff options
author | Nathan Kinder <nkinder@redhat.com> | 2010-02-09 12:21:34 -0800 |
---|---|---|
committer | Nathan Kinder <nkinder@redhat.com> | 2010-02-09 12:21:34 -0800 |
commit | f81e7eac08e2af16fa6b8d245525c4a5ac5eb6f7 (patch) | |
tree | 27690a5ee242ed4b28e3696b74b916f6d841084b | |
parent | 571f580206b38cc92b87c7458a42f2b1a4789830 (diff) | |
download | ds-f81e7eac08e2af16fa6b8d245525c4a5ac5eb6f7.tar.gz ds-f81e7eac08e2af16fa6b8d245525c4a5ac5eb6f7.tar.xz ds-f81e7eac08e2af16fa6b8d245525c4a5ac5eb6f7.zip |
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.
-rwxr-xr-x[-rw-r--r--] | Makefile.in | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | aclocal.m4 | 0 | ||||
-rwxr-xr-x | configure | 7 | ||||
-rwxr-xr-x[-rw-r--r--] | ltmain.sh | 0 | ||||
-rw-r--r-- | m4/pcre.m4 | 7 |
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 @@ -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 @@ -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)' |