aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/configure14
-rw-r--r--tools/m4/set_cflags_ldflags.m414
2 files changed, 14 insertions, 14 deletions
diff --git a/tools/configure b/tools/configure
index 4a37fe60f9..5a156145e8 100755
--- a/tools/configure
+++ b/tools/configure
@@ -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 --git a/tools/m4/set_cflags_ldflags.m4 b/tools/m4/set_cflags_ldflags.m4
index 7e357ba6b4..cbad3c10b0 100644
--- a/tools/m4/set_cflags_ldflags.m4
+++ b/tools/m4/set_cflags_ldflags.m4
@@ -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"])