code.ossystems Code Review - openembedded-core.git/blob

   1 From e7a8c925b9316a72bdc8f32789ffe56fda5c4788 Mon Sep 17 00:00:00 2001
   2 From: Alexander Kanavin <alex.kanavin@gmail.com>
   3 Date: Fri, 26 Aug 2016 18:20:32 +0300
   4 Subject: [PATCH] Use pkg-config for pcre dependency instead of -config script.
   5
   6 RP 2014/5/22
   7 Upstream-Status: Pending
   8 Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
   9 ---
  10  configure.ac | 11 ++++++-----
  11  1 file changed, 6 insertions(+), 5 deletions(-)
  12
  13 diff --git a/configure.ac b/configure.ac
  14 index 1d172a1..a9236da 100644
  15 --- a/configure.ac
  16 +++ b/configure.ac
  17 @@ -380,11 +380,12 @@ if test "$WITH_PCRE" != "no"; then
  18                         PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
  19                         CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
  20                 else
  21 -                       AC_PATH_PROG(PCRECONFIG, pcre-config)
  22 -                       if test x"$PCRECONFIG" != x; then
  23 -                               PCRE_LIB=`$PCRECONFIG --libs`
  24 -                               CPPFLAGS="$CPPFLAGS `$PCRECONFIG --cflags`"
  25 -                       fi
  26 +                       PKG_CHECK_MODULES(PCREPKG, [libpcre], [
  27 +                               PCRE_LIB=${PCREPKG_LIBS}
  28 +                               CPPFLAGS="$CPPFLAGS ${PCREPKG_CFLAGS}"
  29 +                       ], [
  30 +                               AC_MSG_ERROR([pcre pkgconfig not found, install the pcre-devel package or build with --without-pcre])
  31 +                       ])
  32                 fi
  33
  34    if test x"$PCRE_LIB" != x; then
  35 --
  36 2.9.3
  37