Cache values so they're reset when we rerun the configure script.

This works fine whenever it is rerun 'cause for instance configure.in
or something else has changed.
However, when you remove config.cache you may need to rerun autogen.sh
to get it working (but I'm working on getting this fixed as well).

svn path=/trunk/; revision=1321

diff --git a/macros2/gnome-common.m4 b/macros2/gnome-common.m4
index 114e054..c0dda4d 100644 (file)
--- a/macros2/gnome-common.m4
+++ b/macros2/gnome-common.m4
@@ -6,8 +6,12 @@ dnl GNOME_COMMON_INIT
 
 AC_DEFUN([GNOME_COMMON_INIT],
 [
-       GNOME_ACLOCAL_DIR="$GNOME_COMMON_MACROS_DIR"
-       GNOME_ACLOCAL_FLAGS="$ACLOCAL_FLAGS"
+       AC_CACHE_VAL(ac_cv_gnome_aclocal_dir,
+       [ac_cv_gnome_aclocal_dir="$GNOME_COMMON_MACROS_DIR"])
+       AC_CACHE_VAL(ac_cv_gnome_aclocal_flags,
+       [ac_cv_gnome_aclocal_flags="$ACLOCAL_FLAGS"])
+       GNOME_ACLOCAL_DIR="$ac_cv_gnome_aclocal_dir"
+       GNOME_ACLOCAL_FLAGS="$ac_cv_gnome_aclocal_flags"
        AC_SUBST(GNOME_ACLOCAL_DIR)
        AC_SUBST(GNOME_ACLOCAL_FLAGS)