Build system: Set the appropriate CPPFLAGS and LDFLAGS when checking for librrd and...

diff --git a/configure.in b/configure.in
index 6c0f3b45fd615a724ffd48077ae73883a8994c75..eb96d4e1b11787a116dec2c3ca3177b8f00dd782 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -683,19 +683,25 @@ AC_ARG_WITH(rrdtool, [AS_HELP_STRING([--with-rrdtool@<:@=PREFIX@:>@], [Path to r
 ], [with_rrdtool="yes"])
 if test "x$with_rrdtool" = "xyes"
 then
-       SAVE_CFLAGS="$CFLAGS"
+       SAVE_CPPFLAGS="$CPPFLAGS"
        SAVE_LDFLAGS="$LDFLAGS"
 
-       CFLAGS="$CFLAGS $librrd_cflags"
+       CPPFLAGS="$CPPFLAGS $librrd_cflags"
        LDFLAGS="$LDFLAGS $librrd_ldflags"
 
        AC_CHECK_HEADERS(rrd.h,, [with_rrdtool="no (rrd.h not found)"])
 
-       CFLAGS="$SAVE_CFLAGS"
+       CPPFLAGS="$SAVE_CPPFLAGS"
        LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then
+       SAVE_CPPFLAGS="$CPPFLAGS"
+       SAVE_LDFLAGS="$LDFLAGS"
+
+       CPPFLAGS="$CPPFLAGS $librrd_cflags"
+       LDFLAGS="$LDFLAGS $librrd_ldflags"
+
        AC_CHECK_LIB(rrd_th, rrd_update_r,
        [with_rrdtool="yes"
         librrd_ldflags="$librrd_ldflags -lrrd_th -lm"
@@ -709,6 +715,9 @@ then
         [-lm])
        ]
        [-lm])
+
+       CPPFLAGS="$SAVE_CPPFLAGS"
+       LDFLAGS="$SAVE_LDFLAGS"
 fi
 if test "x$with_rrdtool" = "xyes"
 then