src/patches/collectd/0012-don-t-assume-pkg-config-is-in-PATH.patch

   1 From c2ca2a46e617878dcff69de0b8940ea91d3401cc Mon Sep 17 00:00:00 2001
   2 From: Lauri Tirkkonen <lotheac@iki.fi>
   3 Date: Thu, 22 May 2014 14:05:40 +0300
   4 Subject: [PATCH 12/22] don't assume pkg-config is in PATH
   5
   6 ---
   7  configure.in | 20 ++++++++++----------
   8  1 file changed, 10 insertions(+), 10 deletions(-)
   9
  10 diff --git a/configure.in b/configure.in
  11 index 0b12630..7086800 100644
  12 --- a/configure.in
  13 +++ b/configure.in
  14 @@ -1136,8 +1136,8 @@ AC_CHECK_LIB(hal,libhal_device_property_exists,
  15              [with_libhal="no"])
  16  if test "x$with_libhal" = "xyes"; then
  17         if test "x$PKG_CONFIG" != "x"; then
  18 -               BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
  19 -               BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
  20 +               BUILD_WITH_LIBHAL_CFLAGS="`$PKG_CONFIG --cflags hal`"
  21 +               BUILD_WITH_LIBHAL_LIBS="`$PKG_CONFIG --libs hal`"
  22                 AC_SUBST(BUILD_WITH_LIBHAL_CFLAGS)
  23                 AC_SUBST(BUILD_WITH_LIBHAL_LIBS)
  24         fi
  25 @@ -3434,8 +3434,8 @@ then
  26    if $PKG_CONFIG --exists tokyotyrant
  27    then
  28      with_libtokyotyrant_cppflags="$with_libtokyotyrant_cppflags `$PKG_CONFIG --cflags tokyotyrant`"
  29 -    with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `pkg-config --libs-only-L tokyotyrant`"
  30 -    with_libtokyotyrant_libs="$with_libtokyotyrant_libs `pkg-config --libs-only-l tokyotyrant`"
  31 +    with_libtokyotyrant_ldflags="$with_libtokyotyrant_ldflags `$PKG_CONFIG --libs-only-L tokyotyrant`"
  32 +    with_libtokyotyrant_libs="$with_libtokyotyrant_libs `$PKG_CONFIG --libs-only-l tokyotyrant`"
  33    fi
  34  fi
  35
  36 @@ -3743,7 +3743,7 @@ with_libvirt_cflags=""
  37  with_libvirt_ldflags=""
  38  if test "x$PKG_CONFIG" != "x"
  39  then
  40 -       pkg-config --exists 'libxml-2.0' 2>/dev/null
  41 +       $PKG_CONFIG --exists 'libxml-2.0' 2>/dev/null
  42         if test "$?" = "0"
  43         then
  44                 with_libxml2="yes"
  45 @@ -3751,7 +3751,7 @@ then
  46                 with_libxml2="no (pkg-config doesn't know library)"
  47         fi
  48
  49 -       pkg-config --exists libvirt 2>/dev/null
  50 +       $PKG_CONFIG --exists libvirt 2>/dev/null
  51         if test "$?" = "0"
  52         then
  53                 with_libvirt="yes"
  54 @@ -3761,12 +3761,12 @@ then
  55  fi
  56  if test "x$with_libxml2" = "xyes"
  57  then
  58 -       with_libxml2_cflags="`pkg-config --cflags libxml-2.0`"
  59 +       with_libxml2_cflags="`$PKG_CONFIG --cflags libxml-2.0`"
  60         if test $? -ne 0
  61         then
  62                 with_libxml2="no"
  63         fi
  64 -       with_libxml2_ldflags="`pkg-config --libs libxml-2.0`"
  65 +       with_libxml2_ldflags="$PKG_CONFIG --libs libxml-2.0`"
  66         if test $? -ne 0
  67         then
  68                 with_libxml2="no"
  69 @@ -3806,12 +3806,12 @@ if test "x$with_libxml2" = "xyes"; then
  70  fi
  71  if test "x$with_libvirt" = "xyes"
  72  then
  73 -       with_libvirt_cflags="`pkg-config --cflags libvirt`"
  74 +       with_libvirt_cflags="$PKG_CONFIG --cflags libvirt`"
  75         if test $? -ne 0
  76         then
  77                 with_libvirt="no"
  78         fi
  79 -       with_libvirt_ldflags="`pkg-config --libs libvirt`"
  80 +       with_libvirt_ldflags="$PKG_CONFIG --libs libvirt`"
  81         if test $? -ne 0
  82         then
  83                 with_libvirt="no"
  84 --
  85 1.9.3
  86