aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog7
-rw-r--r--macros/compiler-flags.m412
2 files changed, 17 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 017dbdd565..8dd494d7d8 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,10 @@
+1999-02-05 Martin Baulig <martin@home-of-linux.org>
+
+ * compiler-flags.m4: Don't add warning and compiler flags to
+ the CFLAGS and CXXFLAGS when they're cached. This fixes the
+ problem that CFLAGS and CXXFLAGS get longer and longer each
+ time you run a `config.status --recheck'.
+
1999-02-04 Martin Baulig <martin@home-of-linux.org>
* aclocal-include.m4 (INSIDE_GNOME_COMMON): New automake
diff --git a/macros/compiler-flags.m4 b/macros/compiler-flags.m4
index ae85b26f22..fb5d1d25e2 100644
--- a/macros/compiler-flags.m4
+++ b/macros/compiler-flags.m4
@@ -43,7 +43,11 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
fi
fi
AC_MSG_RESULT($complCFLAGS)
- CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+ if test "x$cflags_set" != "xyes"; then
+ CFLAGS="$CFLAGS $warnCFLAGS $complCFLAGS"
+ cflags_set=yes
+ AC_SUBST(cflags_set)
+ fi
])
dnl For C++, do basically the same thing.
@@ -90,5 +94,9 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
fi
fi
AC_MSG_RESULT($complCXXFLAGS)
- CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ if test "x$cxxflags_set" != "xyes"; then
+ CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+ cxxflags_set=yes
+ AC_SUBST(cxxflags_set)
+ fi
])