From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 30 Apr 2008 06:18:08 +0000 (+0200)
Subject: Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2
X-Git-Tag: collectd-4.4.0~4^2~5^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9aa991630584e29e5012a2c8ad887a8c48013d63;p=collectd.git

Merge branch 'collectd-4.2' of /var/lib/git/collectd into collectd-4.2
---

9aa991630584e29e5012a2c8ad887a8c48013d63
diff --cc configure.in
index 62f70e13,b5138a26..ae11ecfa
--- a/configure.in
+++ b/configure.in
@@@ -1087,13 -1091,14 +1091,15 @@@ AC_CHECK_LIB(IOKit, IOServiceGetMatchin
  AC_DEFINE_UNQUOTED(COLLECT_LIBIOKIT, [$collect_libiokit], [Wether or not to use the IOKit library])
  AM_CONDITIONAL(BUILD_WITH_LIBIOKIT, test "x$with_libiokit" = "xyes")
  
+ with_libstatgrab_cflags=""
+ with_libstatgrab_ldflags=""
  AC_ARG_WITH(libstatgrab, [AS_HELP_STRING([--with-libstatgrab@<:@=PREFIX@:>@], [Path to libstatgrab.])],
  [
 -	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"
+ 		with_libstatgrab_cflags="-I$withval/include"
+ 		with_libstatgrab_ldflags="-L$withval/lib"
  		with_libstatgrab="yes"
  	fi
  ],