From: Florian Forster <octo@noris.net>
Date: Tue, 1 Apr 2008 12:11:35 +0000 (+0200)
Subject: configure.in: Set CPPFLAGS when checking headers.
X-Git-Tag: collectd-4.2.7~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=06c09feedb03c7167168a0caacd9afdd5fe4e985;p=collectd.git

configure.in: Set CPPFLAGS when checking headers.

When checking for <upsclient.h> (and the headers of a few other libraries) the
library specific CFLAGS were added to the global CFLAGS variable. This variable
is used when checking for ``header usability'', but not when checking for
``header presence'' for some reason.

This commit uses the global CPPFLAGS variable instead, which is used in both
checks. Libraries that benefit from this commit are:
- libcurl,
- libmysql(client),
- libnetsnmp,
- libupsclient.

Resolves #6
---

diff --git a/configure.in b/configure.in
index e68d97e2..db344978 100644
--- a/configure.in
+++ b/configure.in
@@ -978,12 +978,12 @@ then
 	then
 		with_libcurl="no ($with_curl_config failed)"
 	else
-		SAVE_CFLAGS=$CFLAGS
-		CFLAGS="$CFLAGS $with_curl_cflags"
+		SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $with_curl_cflags"
 
 		AC_CHECK_HEADERS(curl/curl.h, [], [with_libcurl="no (curl/curl.h not found)"], [])
 
-		CFLAGS="$SAVE_CFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
 	fi
 fi
 if test "x$with_libcurl" = "xyes"
@@ -1170,12 +1170,12 @@ then
 	then
 		with_libmysql="no"
 	else
-		SAVE_CFLAGS=$CFLAGS
-		CFLAGS="$CFLAGS $with_mysql_cflags"
+		SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $with_mysql_cflags"
 
 		AC_CHECK_HEADERS(mysql/mysql.h, [], [with_libmysql="no (mysql/mysql.h not found)"], [])
 
-		CFLAGS="$SAVE_CFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
 	fi
 fi
 if test "x$with_libmysql" = "xyes"
@@ -1465,12 +1465,12 @@ then
 	then
 		with_libnetsnmp="no ($with_snmp_config failed)"
 	else
-		SAVE_CFLAGS=$CFLAGS
-		CFLAGS="$CFLAGS $with_snmp_cflags"
+		SAVE_CPPFLAGS="$CPPFLAGS"
+		CPPFLAGS="$CPPFLAGS $with_snmp_cflags"
 		
 		AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
 
-		CFLAGS="$SAVE_CFLAGS"
+		CPPFLAGS="$SAVE_CPPFLAGS"
 	fi
 fi
 if test "x$with_libnetsnmp" = "xyes"
@@ -1533,12 +1533,12 @@ then
 fi
 if test "x$with_libupsclient" = "xyes"
 then
-	SAVE_CFLAGS="$CFLAGS"
-	CFLAGS="$CFLAGS $with_upsclient_cflags"
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
 
 	AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"])
 
-	CFLAGS="$SAVE_CFLAGS"
+	CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 if test "x$with_libupsclient" = "xyes"
 then
@@ -1565,10 +1565,15 @@ then
 fi
 if test "x$with_libupsclient" = "xyes"
 then
+	SAVE_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $with_upsclient_cflags"
+
 	AC_CHECK_TYPES([UPSCONN_t, UPSCONN], [], [], 
 [#include <stdlib.h>
 #include <stdio.h>
 #include <upsclient.h>])
+
+	CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 AM_CONDITIONAL(BUILD_WITH_LIBUPSCLIENT, test "x$with_libupsclient" = "xyes")