X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.in;h=41ee95555c9a5c419d44601f182cab0e8d962b61;hb=4e51eefd95e80f90eae602958713c9c630659ce7;hp=08b2ca46bd63e24bbd26fda1510859a88b3b26d0;hpb=6b93a8f0ade39c344013e11d3f8ae636e2930324;p=collectd.git

diff --git a/configure.in b/configure.in
index 08b2ca46..41ee9555 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_HEADER_DIRENT
 
-AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h)
+AC_CHECK_HEADERS(stdint.h stdio.h errno.h math.h stdarg.h syslog.h fcntl.h signal.h assert.h sys/types.h sys/socket.h sys/select.h poll.h netdb.h arpa/inet.h sys/resource.h sys/param.h kstat.h regex.h sys/ioctl.h endian.h sys/isa_defs.h)
 
 # For ping library
 AC_CHECK_HEADERS(netinet/in_systm.h, [], [],
@@ -891,7 +891,6 @@ AC_CHECK_LIB(hal,libhal_device_property_exists,
 	     [AC_DEFINE(HAVE_LIBHAL, 1, [Define to 1 if you have 'hal' library])],
 	     [with_libhal="no"])
 if test "x$with_libhal" = "xyes"; then
-	PKG_PROG_PKG_CONFIG
 	if test "x$PKG_CONFIG" != "x"; then
 		BUILD_WITH_LIBHAL_CFLAGS="`pkg-config --cflags hal`"
 		BUILD_WITH_LIBHAL_LIBS="`pkg-config --libs hal`"
@@ -968,7 +967,8 @@ then
 fi
 
 AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
-[	if test "x$withval" != "xno" -a "x$withval" != "xyes"
+[	if test "x$withval" != "xno" \
+		&& test "x$withval" != "xyes"
 	then
 		LDFLAGS="$LDFLAGS -L$withval/lib"
 		CPPFLAGS="$CPPFLAGS -I$withval/include"
@@ -1517,7 +1517,8 @@ fi
 
 AC_SUBST(PERL, "$perl_interpreter")
 
-if test "x$with_libperl" = "xyes" -a -n "$perl_interpreter"
+if test "x$with_libperl" = "xyes" \
+	&& test -n "$perl_interpreter"
 then
   SAVE_CFLAGS=$CFLAGS
   SAVE_LDFLAGS=$LDFLAGS
@@ -1736,44 +1737,36 @@ then
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
 
-with_upsclient_config="libupsclient-config"
-with_upsclient_cflags=""
-with_upsclient_libs=""
-AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to libupsclient.])],
-[
-	if test "x$withval" = "xno"
+with_libupsclient="no (pkg-config isn't available)"
+with_libupsclient_cflags=""
+with_libupsclient_libs=""
+if test "x$PKG_CONFIG" != "x"
+then
+	pkg-config --exists 'libupsclient' 2>/dev/null
+	if test "$?" = "0"
 	then
-		with_libupsclient="no"
-	else
-		if test "x$withval" != "xyes"
-		then
-			if test -f "$withval" && test -x "$withval";
-			then
-				with_upsclient_config="$withval"
-			else
-				with_upsclient_config="$withval/bin/libupsclient-config"
-			fi
-		fi
 		with_libupsclient="yes"
+	else
+		with_libupsclient="no (pkg-config doesn't know library)"
 	fi
-],
-[
-	with_libupsclient="yes"
-])
+fi
 if test "x$with_libupsclient" = "xyes"
 then
-	with_upsclient_cflags=`$with_upsclient_config --cflags 2>/dev/null`
-	upsclient_config_status=$?
-
-	if test $upsclient_config_status -ne 0
+	with_libupsclient_cflags="`pkg-config --cflags 'libupsclient'`"
+	if test $? -ne 0
+	then
+		with_libupsclient="no"
+	fi
+	with_libupsclient_libs="`pkg-config --libs 'libupsclient'`"
+	if test $? -ne 0
 	then
-		with_libupsclient="no ($with_upsclient_config failed)"
+		with_libupsclient="no"
 	fi
 fi
 if test "x$with_libupsclient" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
+	CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
 
 	AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"])
 
@@ -1781,31 +1774,23 @@ then
 fi
 if test "x$with_libupsclient" = "xyes"
 then
-	with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null`
-	upsclient_config_status=$?
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	SAVE_LDFLAGS="$LDFLAGS"
+
+	CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
+	LDFLAGS="$LDFLAGS $with_libupsclient_libs"
 
-	if test $upsclient_config_status -ne 0
-	then
-		with_libupsclient="no ($with_upsclient_config failed)"
-	fi
-fi
-if test "x$with_libupsclient" = "xyes"
-then
 	AC_CHECK_LIB(upsclient, upscli_connect,
-	[
-		BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags"
-		BUILD_WITH_LIBUPSCLIENT_LIBS="$with_upsclient_libs"
-		AC_SUBST(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
-		AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
-	],
-	[
-		with_libupsclient="no (symbol 'upscli_connect' not found)"
-	], [$with_upsclient_libs])
+		     [with_libupsclient="yes"],
+		     [with_libupsclient="no (symbol upscli_connect not found)"])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
+	LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_libupsclient" = "xyes"
 then
 	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
+	CPPFLAGS="$CPPFLAGS $with_libupsclient_cflags"
 
 	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [],
 [#include <stdlib.h>
@@ -1814,7 +1799,13 @@ then
 
 	CPPFLAGS="$SAVE_CPPFLAGS"
 fi
-AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes")
+if test "x$with_libupsclient" = "xyes"
+then
+	BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_libupsclient_cflags"
+	BUILD_WITH_LIBUPSCLIENT_LIBS="$with_libupsclient_libs"
+	AC_SUBST(BUILD_WITH_LIBUPSCLIENT_CFLAGS)
+	AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS)
+fi
 
 ### BEGIN of check for libxmms ###
 with_xmms_config="xmms-config"
@@ -1822,7 +1813,8 @@ with_xmms_cflags=""
 with_xmms_libs=""
 AC_ARG_WITH(libxmms, [AS_HELP_STRING([--with-libxmms@<:@=PREFIX@:>@], [Path to libxmms.])],
 [
-	if test "x$withval" != "xno" -a "x$withval" != "xyes"
+	if test "x$withval" != "xno" \
+		&& test "x$withval" != "xyes"
 	then
 		if test -f "$withval" && test -x "$withval";
 		then
@@ -2515,7 +2507,8 @@ AC_PLUGIN([wireless],    [$plugin_wireless],   [Wireless statistics])
 AC_PLUGIN([xmms],        [$with_libxmms],      [XMMS statistics])
 
 dnl ip_vs.h
-if test "x$ac_system" = "xLinux" -a "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono"
+if test "x$ac_system" = "xLinux" \
+	&& test "x$have_net_ip_vs_h$have_ip_vs_h" = "xnono"
 then
 	enable_ipvs="$enable_ipvs (ip_vs.h not found)"
 fi
@@ -2552,12 +2545,14 @@ AC_SUBST(PERL_BINDINGS_OPTIONS)
 
 AC_OUTPUT(Makefile src/Makefile src/collectd.conf src/libiptc/Makefile src/liboconfig/Makefile src/liboping/Makefile bindings/Makefile)
 
-if test "x$with_rrdtool" = "xyes" -a "x$librrd_threadsafe" != "xyes"
+if test "x$with_rrdtool" = "xyes" \
+	&& test "x$librrd_threadsafe" != "xyes"
 then
 	with_rrdtool="yes (warning: librrd is not thread-safe)"
 fi
 
-if test "x$with_liboping" = "xyes" -a "x$with_own_liboping" = "xyes"
+if test "x$with_liboping" = "xyes" \
+	&& test "x$with_own_liboping" = "xyes"
 then
 	with_liboping="yes (shipped version)"
 fi
@@ -2574,7 +2569,8 @@ else
 	enable_perl="no (needs libperl)"
 fi
 
-if test "x$with_perl_bindings" = "xyes" -a "x$PERL_BINDINGS_OPTIONS" != "x"
+if test "x$with_perl_bindings" = "xyes" \
+	&& test "x$PERL_BINDINGS_OPTIONS" != "x"
 then
 	with_perl_bindings="yes ($PERL_BINDINGS_OPTIONS)"
 fi