[Xen-changelog] [xen-unstable] autoconf: correctly parse *_INCLUDES and *_LIB env vars

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Roger Pau Monne <roger.pau@xxxxxxxxxx>
# Date 1340980317 -3600
# Node ID f7576f2fe8f9614ce926bf7fb8d1695c009eec1e
# Parent  a2abb62aedbe3fb0a6ad25dd20a9c4b21427f002
autoconf: correctly parse *_INCLUDES and *_LIB env vars

Parse those options correctly, since the "+=" operator is not valid.
Also added CPPFLAGS, so headers checks don't give strange results.

Please rerun configure after applying.

Signed-off-by: Roger Pau Monne <roger.pau@xxxxxxxxxx>
Cc: Christoph Egger <Christoph.Egger@xxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r a2abb62aedbe -r f7576f2fe8f9 tools/configure
--- a/tools/configure   Fri Jun 29 11:24:10 2012 +0100
+++ b/tools/configure   Fri Jun 29 15:31:57 2012 +0100
@@ -2594,23 +2594,23 @@ debug=$ax_cv_debug
 
 
 
-for cflag in $PREPEND_INCLUDES
+for cppflag in $PREPEND_INCLUDES
 do
-    PREPEND_CFLAGS+=" -I$cflag"
+    PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag"
 done
 for ldflag in $PREPEND_LIB
 do
-    PREPEND_LDFLAGS+=" -L$ldflag"
+    PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag"
 done
-for cflag in $APPEND_INCLUDES
+for cppflag in $APPEND_INCLUDES
 do
-    APPEND_CFLAGS+=" -I$cflag"
+    APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag"
 done
 for ldflag in $APPEND_LIB
 do
-    APPEND_LDFLAGS+=" -L$ldflag"
+    APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag"
 done
-CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS"
+CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS"
 LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"
 
 
diff -r a2abb62aedbe -r f7576f2fe8f9 tools/m4/set_cflags_ldflags.m4
--- a/tools/m4/set_cflags_ldflags.m4    Fri Jun 29 11:24:10 2012 +0100
+++ b/tools/m4/set_cflags_ldflags.m4    Fri Jun 29 15:31:57 2012 +0100
@@ -1,20 +1,20 @@
 AC_DEFUN([AX_SET_FLAGS],
-[for cflag in $PREPEND_INCLUDES
+[for cppflag in $PREPEND_INCLUDES
 do
-    PREPEND_CFLAGS+=" -I$cflag"
+    PREPEND_CPPFLAGS="$PREPEND_CPPFLAGS -I$cppflag"
 done
 for ldflag in $PREPEND_LIB
 do
-    PREPEND_LDFLAGS+=" -L$ldflag"
+    PREPEND_LDFLAGS="$PREPEND_LDFLAGS -L$ldflag"
 done
-for cflag in $APPEND_INCLUDES
+for cppflag in $APPEND_INCLUDES
 do
-    APPEND_CFLAGS+=" -I$cflag"
+    APPEND_CPPFLAGS="$APPEND_CPPFLAGS -I$cppflag"
 done
 for ldflag in $APPEND_LIB
 do
-    APPEND_LDFLAGS+=" -L$ldflag"
+    APPEND_LDFLAGS="$APPEND_LDFLAGS -L$ldflag"
 done
-CFLAGS="$PREPEND_CFLAGS $CFLAGS $APPEND_CFLAGS"
+CPPFLAGS="$PREPEND_CPPFLAGS $CPPFLAGS $APPEND_CPPFLAGS"
 LDFLAGS="$PREPEND_LDFLAGS $LDFLAGS $APPEND_LDFLAGS"])
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog