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

   1 From 22afc5d9aaa215c3c87ba21c77d47da44ab3b113 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 | 16 ++++++++++++----
  11  1 file changed, 12 insertions(+), 4 deletions(-)
  12
  13 diff --git a/configure.ac b/configure.ac
  14 index 5383cec..c29a902 100644
  15 --- a/configure.ac
  16 +++ b/configure.ac
  17 @@ -651,10 +651,18 @@ AC_ARG_WITH([pcre],
  18  )
  19  AC_MSG_RESULT([$WITH_PCRE])
  20
  21 -if test "$WITH_PCRE" != no; then
  22 -  if test "$WITH_PCRE" != yes; then
  23 -    PCRE_LIB="-L$WITH_PCRE/lib -lpcre"
  24 -    CPPFLAGS="$CPPFLAGS -I$WITH_PCRE/include"
  25 +if test "$WITH_PCRE" != "no"; then
  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 +
  33 +  if test x"$PCRE_LIB" != x; then
  34 +    AC_DEFINE([HAVE_LIBPCRE], [1], [libpcre])
  35 +    AC_DEFINE([HAVE_PCRE_H], [1], [pcre.h])
  36 +    AC_SUBST(PCRE_LIB)
  37    else
  38      AC_PATH_PROG([PCRECONFIG], [pcre-config])
  39      if test -n "$PCRECONFIG"; then
  40 --
  41 2.15.0
  42