From e791fa91e1cf63546d32a60a7496e153ee78de90 Mon Sep 17 00:00:00 2001
From: Florian Forster <octo@collectd.org>
Date: Fri, 12 May 2017 08:05:47 +0200
Subject: [PATCH] configure.ac: Remove empty else-block from AC_CHECK_LIB.

Fixes: #2272
---
 configure.ac | 3 +--
 src/nut.c    | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index d4207ab6..3962fc99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5307,8 +5307,7 @@ if test "x$with_libupsclient" = "xyes"; then
   )
 
   AC_CHECK_LIB([upsclient], [upscli_init],
-    [AC_DEFINE([WITH_UPSCLIENT_27], [1], [At least version 2-7])],
-    []
+    [AC_DEFINE([HAVE_UPSCLI_INIT], [1], [Define when upscli_init() (since version 2-7) is available.])]
   )
 
   LDFLAGS="$SAVE_LDFLAGS"
diff --git a/src/nut.c b/src/nut.c
index 5acbdde6..7dadf50e 100644
--- a/src/nut.c
+++ b/src/nut.c
@@ -169,7 +169,7 @@ static void nut_submit(nut_ups_t *ups, const char *type,
 } /* void nut_submit */
 
 static int nut_connect(nut_ups_t *ups) {
-#ifdef WITH_UPSCLIENT_27
+#if HAVE_UPSCLI_INIT
   int status;
   int ssl_status;
   int ssl_flags;
@@ -236,7 +236,7 @@ static int nut_connect(nut_ups_t *ups) {
   } /* if (ssl_status == 1 && verify_peer == 1) */
   return (0);
 
-#else /* #ifdef WITH_UPSCLIENT_27 */
+#else /* #if HAVE_UPSCLI_INIT */
   int status;
   int ssl_status;
   int ssl_flags;
@@ -310,7 +310,7 @@ static int nut_read_one(nut_ups_t *ups) {
           ups->upsname, upscli_strerror(ups->conn));
     upscli_disconnect(ups->conn);
     sfree(ups->conn);
-#ifdef WITH_UPSCLIENT_27
+#if HAVE_UPSCLI_INIT
     upscli_cleanup();
 #endif
     return (-1);
@@ -400,7 +400,7 @@ static int nut_shutdown(void) {
     free_nut_ups_t(this);
     this = next;
   }
-#ifdef WITH_UPSCLIENT_27
+#if HAVE_UPSCLI_INIT
   upscli_cleanup();
 #endif
 
-- 
2.30.2