build system: Several fixes for libcurl, libmysql, and libupsclient.

libcurl:      Check for CFLAGS using `curl-config --cflags' and use these
	      CFLAGS when checking for <curl/curl.h> to allow for weird
	      locations of the library.
libmysql:     Cleaned up the checking code.
libupsclient: Check if the header file provides `UPSCONN' or `UPSCONN_t' and
	      use the one available. This should fix compile issues with with
	      the nut plugin.

diff --git a/configure.in b/configure.in
index cbf9190..87c0ba8 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -836,70 +836,73 @@ AM_CONDITIONAL(BUILD_WITH_LIBDEVINFO, test "x$with_devinfo" = "xyes")
 
 ### BEGIN of check for libcurl ###
 with_curl_config="curl-config"
-with_curl_prefix=0
+with_curl_cflags=""
 with_curl_libs=""
 AC_ARG_WITH(libcurl, [AS_HELP_STRING([--with-libcurl@<:@=PREFIX@:>@], [Path to libcurl.])],
 [
-       if test "x$withval" != "xno" -a "x$withval" != "xyes"
-       then
-               if test -x "$withval/bin/curl-config"
-               then
-                       with_curl_config="$withval/bin/curl-config"
-                       with_curl_prefix=1
-               fi
-       fi
        if test "x$withval" = "xno"
        then
                with_libcurl="no"
-       else
+       else if test "x$withval" = "xyes"
+       then
                with_libcurl="yes"
-       fi
+       else
+               if test -x "$withval"
+               then
+                       with_curl_config="$withval"
+               else if test -x "$withval/bin/curl-config"
+               then
+                       with_curl_config="$withval/bin/curl-config"
+               fi; fi
+       fi; fi
 ],
 [
        with_libcurl="yes"
 ])
 if test "x$with_libcurl" = "xyes"
 then
-       with_curl_libs=`$with_curl_config --libs 2>/dev/null`
+       with_curl_cflags=`$with_curl_config --cflags 2>/dev/null`
        curl_config_status=$?
 
        if test $curl_config_status -ne 0
        then
                with_libcurl="no"
        else
-               AC_CHECK_LIB(curl, curl_easy_init,
-               [
-                       BUILD_WITH_LIBCURL_LIBS="$with_curl_libs"
-                       AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
-               ],
-               [
-                       with_libcurl="no"
-               ],
-               [$with_curl_libs])
+               SAVE_CFLAGS=$CFLAGS
+               CFLAGS="$CFLAGS $with_curl_cflags"
+
+               AC_CHECK_HEADERS(curl/curl.h, [], [with_libcurl="no (curl/curl.h not found)"], [])
+
+               CFLAGS="$SAVE_CFLAGS"
        fi
 fi
-if test "x$with_libcurl" = "xyes" -a $with_curl_prefix -ne 0
+if test "x$with_libcurl" = "xyes"
 then
-       with_curl_prefix=`$with_curl_config --libs 2>/dev/null`
+       with_curl_libs=`$with_curl_config --libs 2>/dev/null`
        curl_config_status=$?
 
        if test $curl_config_status -ne 0
        then
                with_libcurl="no"
        else
-               if test -d "$with_curl_prefix/include"
-               then
-                       CPPFLAGS="$CPPFLAGS -I$with_curl_prefix/include"
-               fi
+               AC_CHECK_LIB(curl, curl_easy_init,
+                [
+                 # We need to do this to have `HAVE_LIBCURL' defined but
+                 # `-lcurl' NOT added to the default LDFLAGS.
+                       AC_DEFINE(HAVE_LIBCURL, 1,
+                                 [Define to 1 if you have the curl library.])
+                ],
+                [with_libcurl="no (symbol 'curl_easy_init' not found)"],
+                [$with_curl_libs])
        fi
 fi
-
-with_libcurl_numeric=0
 if test "x$with_libcurl" = "xyes"
 then
-       with_libcurl_numeric=1
+       BUILD_WITH_LIBCURL_CFLAGS="$with_curl_cflags"
+       BUILD_WITH_LIBCURL_LIBS="$with_curl_libs"
+       AC_SUBST(BUILD_WITH_LIBCURL_CFLAGS)
+       AC_SUBST(BUILD_WITH_LIBCURL_LIBS)
 fi
-AC_DEFINE_UNQUOTED(HAVE_LIBCURL, [$with_libcurl_numeric], [Define to 1 if you have the 'curl' library (-lcurl).])
 AM_CONDITIONAL(BUILD_WITH_LIBCURL, test "x$with_libcurl" = "xyes")
 ### END of check for libcurl ###
 
@@ -1010,25 +1013,25 @@ AC_DEFINE_UNQUOTED(COLLECT_LM_SENSORS, [$collect_lm_sensors],
 AM_CONDITIONAL(BUILD_WITH_LM_SENSORS, test "x$with_lm_sensors" = "xyes")
 
 with_mysql_config="mysql_config"
-with_mysql_prefix=0
 with_mysql_cflags=""
 with_mysql_libs=""
 AC_ARG_WITH(libmysql, [AS_HELP_STRING([--with-libmysql@<:@=PREFIX@:>@], [Path to libmysql.])],
 [
-       if test "x$withval" != "xno" && test "x$withval" != "xyes"
-       then
-               if test -x "$withval/bin/mysql_config"
-               then
-                       with_mysql_config="$withval/bin/mysql_config"
-                       with_mysql_prefix=1
-               fi
-       fi
        if test "x$withval" = "xno"
        then
                with_libmysql="no"
-       else
+       else if test "x$withval" = "xyes"
+       then
                with_libmysql="yes"
-       fi
+       else
+               if test -x "$withval";
+               then
+                       with_mysql_config="$withval"
+               else if test -x "$withval/bin/mysql_config"
+               then
+                       with_mysql_config="$withval/bin/mysql_config"
+               fi; fi
+       fi; fi
 ],
 [
        with_libmysql="yes"
@@ -1053,15 +1056,22 @@ fi
 if test "x$with_libmysql" = "xyes"
 then
        with_mysql_libs=`$with_mysql_config --libs 2>/dev/null`
-       AC_CHECK_LIB(mysqlclient, mysql_init,
-       [
-               AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1,
-                         [Define to 1 if you have the mysqlclient library (-lmysqlclient).])
-       ],
-       [
-               with_libmysql="no (libmysql not found)"
-       ],
-       [$with_mysql_libs])
+       mysql_config_status=$?
+
+       if test $mysql_config_status -ne 0
+       then
+               with_libmysql="no"
+       else
+               AC_CHECK_LIB(mysqlclient, mysql_init,
+                [
+                 # We need to do this to have `HAVE_LIBMYSQLCLIENT' defined
+                 # but `-lmysqlclient' NOT added to the default LDFLAGS.
+                       AC_DEFINE(HAVE_LIBMYSQLCLIENT, 1,
+                                 [Define to 1 if you have the mysqlclient library.])
+                ],
+                [with_libmysql="no (libmysql not found)"],
+                [$with_mysql_libs])
+       fi
 fi
 if test "x$with_libmysql" = "xyes"
 then
@@ -1304,6 +1314,7 @@ else
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBIPTC, test "x$with_libiptc" = "xyes")
 
+# TODO: Use `libupsclient-config' here.
 AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to libupsclient.])],
 [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"
@@ -1330,6 +1341,13 @@ then
                AC_DEFINE(HAVE_UPSCLIENT_H, 1, [Define to 1 if you have the <upsclient.h> header file.])
        ], [with_libupsclient="no (upsclient.h not found)"])
 fi
+if test "x$with_libupsclient" = "xyes"
+then
+       AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [], 
+[#include <stdlib.h>
+#include <stdio.h>
+#include <upsclient.h>])
+fi
 AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes")
 
 # Check for enabled/disabled features

diff --git a/src/Makefile.am b/src/Makefile.am
index a75a178..ab4d46a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -84,10 +84,13 @@ if BUILD_MODULE_APACHE
 pkglib_LTLIBRARIES += apache.la
 apache_la_SOURCES = apache.c
 apache_la_LDFLAGS = -module -avoid-version
+apache_la_CFLAGS =
+apache_la_LIBADD =
+collectd_LDADD += "-dlopen" apache.la
 if BUILD_WITH_LIBCURL
-apache_la_LDFLAGS += $(BUILD_WITH_LIBCURL_LIBS)
+apache_la_CFLAGS += $(BUILD_WITH_LIBCURL_CFLAGS)
+apache_la_LIBADD += $(BUILD_WITH_LIBCURL_LIBS)
 endif
-collectd_LDADD += "-dlopen" apache.la
 collectd_DEPENDENCIES += apache.la
 endif
 

diff --git a/src/nut.c b/src/nut.c
index 6af12b8..087604f 100644 (file)
--- a/src/nut.c
+++ b/src/nut.c
@@ -34,12 +34,21 @@
 # define NUT_HAVE_READ 0
 #endif
 
+#if HAVE_UPSCONN_T
+typedef UPSCONN_t collectd_upsconn_t;
+#elif HAVE_UPSCONN
+typedef UPSCONN collectd_upsconn_t;
+#else
+# error "Unable to determine the UPS connection type."
+#endif
+
+
 #if NUT_HAVE_READ
 struct nut_ups_s;
 typedef struct nut_ups_s nut_ups_t;
 struct nut_ups_s
 {
-  UPSCONN   *conn;
+  collectd_upsconn_t *conn;
   char      *upsname;
   char      *hostname;
   int        port;
@@ -152,7 +161,7 @@ static int nut_read_one (nut_ups_t *ups)
   /* (Re-)Connect if we have no connection */
   if (ups->conn == NULL)
   {
-    ups->conn = (UPSCONN *) malloc (sizeof (UPSCONN));
+    ups->conn = (collectd_upsconn_t *) malloc (sizeof (collectd_upsconn_t));
     if (ups->conn == NULL)
     {
       ERROR ("nut plugin: malloc failed.");