From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 16 Feb 2009 11:35:23 +0000 (+0100)
Subject: Merge branch 'collectd-4.4' into collectd-4.5
X-Git-Tag: collectd-4.6.0~19^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7c8fb05fcb919fb2d9fc68757c198916396600ce;p=collectd.git

Merge branch 'collectd-4.4' into collectd-4.5

Conflicts:

	configure.in
---

7c8fb05fcb919fb2d9fc68757c198916396600ce
diff --cc configure.in
index 7a4c1517,e99ade7c..2bab6b32
--- a/configure.in
+++ b/configure.in
@@@ -1890,20 -1771,70 +1890,74 @@@ the
  fi
  AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
  
 +PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],
 +		[with_libnotify="yes"],
 +		[with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"])
 +
- with_libupsclient="no (pkg-config isn't available)"
+ with_libupsclient_config=""
  with_libupsclient_cflags=""
  with_libupsclient_libs=""
- if test "x$PKG_CONFIG" != "x"
- then
- 	pkg-config --exists 'libupsclient' 2>/dev/null
- 	if test "$?" = "0"
+ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
+ [
+ 	if test "x$withval" = "xno"
+ 	then
+ 		with_libupsclient="no"
+ 	else if test "x$withval" = "xyes"
  	then
- 		with_libupsclient="yes"
+ 		with_libupsclient="use_pkgconfig"
  	else
+ 		if test -x "$withval"
+ 		then
+ 			with_libupsclient_config="$withval"
+ 			with_libupsclient="use_libupsclient_config"
+ 		else if test -x "$withval/bin/libupsclient-config"
+ 		then
+ 			with_libupsclient_config="$withval/bin/net-snmp-config"
+ 			with_libupsclient="use_libupsclient_config"
+ 		else
+ 			AC_MSG_NOTICE([Not checking for libupsclient: Manually configured])
+ 			with_libupsclient_cflags="-I$withval/include"
+ 			with_libupsclient_libs="-L$withval/lib -lupsclient"
+ 			with_libupsclient="yes"
+ 		fi; fi
+ 	fi; fi
+ ],
+ [with_libupsclient="use_pkgconfig"])
+ 
+ # configure using libupsclient-config
+ if test "x$with_libupsclient" = "xuse_libupsclient_config"
+ then
+ 	AC_MSG_NOTICE([Checking for libupsclient using $with_libupsclient_config])
+ 	with_libupsclient_cflags="`$with_libupsclient_config --cflags`"
+ 	if test $? -ne 0
+ 	then
+ 		with_libupsclient="no ($with_libupsclient_config failed)"
+ 	fi
+ 	with_libupsclient_libs="`$with_libupsclient_config --libs`"
+ 	if test $? -ne 0
+ 	then
+ 		with_libupsclient="no ($with_libupsclient_config failed)"
+ 	fi
+ fi
+ if test "x$with_libupsclient" = "xuse_libupsclient_config"
+ then
+ 	with_libupsclient="yes"
+ fi
+ 
+ # configure using pkg-config
+ if test "x$with_libupsclient" = "xuse_pkgconfig"
+ then
+ 	if test "x$PKG_CONFIG" = "x"
+ 	then
+ 		with_libupsclient="no (Don't have pkg-config)"
+ 	fi
+ fi
+ if test "x$with_libupsclient" = "xuse_pkgconfig"
+ then
+ 	AC_MSG_NOTICE([Checking for libupsclient using $PKG_CONFIG])
+ 	$PKG_CONFIG --exists 'libupsclient' 2>/dev/null
+ 	if test $? -ne 0
+ 	then
  		with_libupsclient="no (pkg-config doesn't know library)"
  	fi
  fi