Merge pull request #3328 from efuss/fix-3312

Fix libupsclient detection

diff --combined configure.ac
index 40ccafe,3578f2e..9fc40b1
--- 1/configure.ac
--- 2/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