From: Florian Forster <octo@huhu.verplant.org>
Date: Wed, 26 Sep 2007 15:18:31 +0000 (+0200)
Subject: Merge branch 'pull/collectd-4.1' into collectd-4.1
X-Git-Tag: collectd-4.1.2~2^2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=747f853a2ce3f8a55438aff274df5ea25a3e9cce;p=collectd.git

Merge branch 'pull/collectd-4.1' into collectd-4.1
---

747f853a2ce3f8a55438aff274df5ea25a3e9cce
diff --cc configure.in
index a13b79c3,51f26c3f..54d38d58
--- a/configure.in
+++ b/configure.in
@@@ -770,14 -770,15 +770,16 @@@ AC_ARG_WITH(libcurl, [AS_HELP_STRING([-
  	then
  		with_libcurl="yes"
  	else
 -		if test -x "$withval"
 +		if test -f "$withval" && test -x "$withval"
  		then
  			with_curl_config="$withval"
+ 			with_libcurl="yes"
  		else if test -x "$withval/bin/curl-config"
  		then
  			with_curl_config="$withval/bin/curl-config"
+ 			with_libcurl="yes"
  		fi; fi
 +		with_libcurl="yes"
  	fi; fi
  ],
  [