| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 5c4d6d8538994d5fe9b3b46bfafaf0a605e3bda6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen.kooi@linaro.org> |
| 3 | Date: Tue, 17 Jun 2014 08:18:17 +0200 |
| 4 | Subject: [PATCH] configure: use pkg-config for pcre detection |
| 5 | |
| 6 | Signed-off-by: Koen Kooi <koen.kooi@linaro.org> |
| 7 | Upstream-Status: pending |
| 8 | --- |
| 9 | configure.ac | 38 +++++++------------------------------- |
| 10 | 1 file changed, 7 insertions(+), 31 deletions(-) |
| 11 | |
| 12 | diff --git a/configure.ac b/configure.ac |
| 13 | index 0c984b7..6edcec1 100644 |
| 14 | --- a/configure.ac |
| 15 | +++ b/configure.ac |
| 16 | @@ -70,38 +70,14 @@ AC_MSG_RESULT([$with_pcre]) |
| 17 | |
| 18 | dnl To make configuring easier, check for a locally built PCRE using the Tools/pcre-build.sh script |
| 19 | if test x"${with_pcre}" = xyes ; then |
| 20 | - AC_MSG_CHECKING([whether to use local PCRE]) |
| 21 | - local_pcre_config=no |
| 22 | - if test -z $PCRE_CONFIG; then |
| 23 | - if test -f `pwd`/pcre/pcre-swig-install/bin/pcre-config; then |
| 24 | - PCRE_CONFIG=`pwd`/pcre/pcre-swig-install/bin/pcre-config |
| 25 | - local_pcre_config=$PCRE_CONFIG |
| 26 | - fi |
| 27 | - fi |
| 28 | - AC_MSG_RESULT([$local_pcre_config]) |
| 29 | -fi |
| 30 | -AS_IF([test "x$with_pcre" != xno], |
| 31 | - [AX_PATH_GENERIC([pcre], |
| 32 | - [], dnl Minimal version of PCRE we need -- accept any |
| 33 | - [], dnl custom sed script for version parsing is not needed |
| 34 | - [AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) |
| 35 | - LIBS="$LIBS $PCRE_LIBS" |
| 36 | - CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" |
| 37 | - ], |
| 38 | - [AC_MSG_FAILURE([ |
| 39 | - Cannot find pcre-config script from PCRE (Perl Compatible Regular Expressions) |
| 40 | - library package. This dependency is needed for configure to complete, |
| 41 | - Either: |
| 42 | - - Install the PCRE developer package on your system (preferred approach). |
| 43 | - - Download the PCRE source tarball, build and install on your system |
| 44 | - as you would for any package built from source distribution. |
| 45 | - - Use the Tools/pcre-build.sh script to build PCRE just for SWIG to statically |
| 46 | - link against. Run 'Tools/pcre-build.sh --help' for instructions. |
| 47 | - (quite easy and does not require privileges to install PCRE on your system) |
| 48 | - - Use configure --without-pcre to disable regular expressions support in SWIG |
| 49 | - (not recommended).]) |
| 50 | - ]) |
| 51 | + PKG_CHECK_MODULES([PCRE], [libpcre], [ |
| 52 | + AC_DEFINE([HAVE_PCRE], [1], [Define if you have PCRE library]) |
| 53 | + LIBS="$LIBS $PCRE_LIBS" |
| 54 | + CPPFLAGS="$CPPFLAGS $PCRE_CFLAGS" |
| 55 | + ], [ |
| 56 | + AC_MSG_WARN([$PCRE_PKG_ERRORS]) |
| 57 | ]) |
| 58 | +fi |
| 59 | |
| 60 | |
| 61 | dnl CCache |
| 62 | -- |
| 63 | 1.9.3 |
| 64 | |