From 30167e0a4a1ff0887f69450eeb990d4c3fc8f6ad Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 25 Sep 2009 19:25:04 +0000 Subject: [PATCH] * configure.ac: Pass any --cache-file=/dev/null option on to subconfigures. * configure: Regenerate. --- ChangeLog | 6 ++++++ configure | 15 ++++++++++++--- configure.ac | 15 ++++++++++++--- 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2f100a9f7de..f470dabeb48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-09-25 Nick Clifton + + * configure.ac: Pass any --cache-file=/dev/null option on to + subconfigures. + * configure: Regenerate. + 2009-09-23 Nick Clifton * config.sub, config.guess: Update from upstream sources. diff --git a/configure b/configure index 667b514b72c..9cce38a1a76 100755 --- a/configure +++ b/configure @@ -6750,9 +6750,11 @@ serialization_dependencies=serdep.tmp # Base args. Strip norecursion, cache-file, srcdir, host, build, # target, nonopt, and variable assignments. These are the ones we -# might not want to pass down to subconfigures. Also strip -# program-prefix, program-suffix, and program-transform-name, so that -# we can pass down a consistent program-transform-name. +# might not want to pass down to subconfigures. The exception being +# --cache-file=/dev/null, which is used to turn off the use of cache +# files altogether, and which should be passed on to subconfigures. +# Also strip program-prefix, program-suffix, and program-transform-name, +# so that we can pass down a consistent program-transform-name. baseargs= keep_next=no skip_next=no @@ -6791,6 +6793,13 @@ do esac case "$ac_arg" in + --cache-file=/dev/null | \ + -cache-file=/dev/null ) + # Handled here to avoid the test to skip args below. + baseargs="$baseargs '$ac_arg'" + # Assert: $separate_arg should always be no. + keep_next=$separate_arg + ;; --no*) continue ;; diff --git a/configure.ac b/configure.ac index e7d44db83dc..91b2bca07d2 100644 --- a/configure.ac +++ b/configure.ac @@ -2632,9 +2632,11 @@ AC_SUBST_FILE(serialization_dependencies) # Base args. Strip norecursion, cache-file, srcdir, host, build, # target, nonopt, and variable assignments. These are the ones we -# might not want to pass down to subconfigures. Also strip -# program-prefix, program-suffix, and program-transform-name, so that -# we can pass down a consistent program-transform-name. +# might not want to pass down to subconfigures. The exception being +# --cache-file=/dev/null, which is used to turn off the use of cache +# files altogether, and which should be passed on to subconfigures. +# Also strip program-prefix, program-suffix, and program-transform-name, +# so that we can pass down a consistent program-transform-name. baseargs= keep_next=no skip_next=no @@ -2673,6 +2675,13 @@ do esac case "$ac_arg" in + --cache-file=/dev/null | \ + -cache-file=/dev/null ) + # Handled here to avoid the test to skip args below. + baseargs="$baseargs '$ac_arg'" + # Assert: $separate_arg should always be no. + keep_next=$separate_arg + ;; --no*) continue ;; -- 2.30.2