From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Wed, 30 Oct 2019 08:20:50 +0000 (+0100)
Subject: Merge pull request #3328 from efuss/fix-3312
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=602665007573569bb50993b9a56da68e70daefad;hp=-c

Merge pull request #3328 from efuss/fix-3312

Fix libupsclient detection
---

602665007573569bb50993b9a56da68e70daefad
diff --combined configure.ac
index 40ccafe3,3578f2e1..9fc40b17
--- a/configure.ac
+++ b/configure.ac
@@@ -5399,7 -5399,7 +5399,7 @@@ AC_ARG_WITH([libtokyotyrant]
        with_libtokyotyrant="$withval"
      else
        with_libtokyotyrant_cppflags="-I$withval/include"
 -      with_libtokyotyrant_ldflags="-L$withval/include"
 +      with_libtokyotyrant_ldflags="-L$withval/lib"
        with_libtokyotyrant_libs="-ltokyotyrant"
        with_libtokyotyrant="yes"
      fi
@@@ -5518,7 -5518,7 +5518,7 @@@ AC_ARG_WITH([libupsclient]
      else if test "x$withval" = "xyes"; then
        with_libupsclient="use_pkgconfig"
      else
-       if test -x "$withval"; then
+       if test -f "$withval" && test -x "$withval"; then
          with_libupsclient_config="$withval"
          with_libupsclient="use_libupsclient_config"
        else if test -x "$withval/bin/libupsclient-config"; then