From 6def357514bdf6b94076b199709ade668c450759 Mon Sep 17 00:00:00 2001 From: Po Lu Date: Mon, 1 Jul 2024 21:44:40 +0800 Subject: [PATCH] * configure.ac: Provide for invocations where no cache file is set. (cherry picked from commit 085a813c338ed8cc56301c1ad6d797e2f5dbd683) --- configure.ac | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 190d13f58d4..402e5fdc752 100644 --- a/configure.ac +++ b/configure.ac @@ -200,8 +200,9 @@ AS_IF([test "$XCONFIGURE" = "android"],[ # Derive a name for a cache file for this configure script from the # current, if specified. exec_cache_file= - AS_IF([test -n "$cache_file"], - [exec_cache_file="--cache-file=$cache_file.2"]) + AS_CASE([$cache_file], [/dev/null | ""], [], + [[[\\/]* | ?:[\\/]*]], [exec_cache_file="--cache-file=$cache_file.2"], + [*], [exec_cache_file="--cache-file=../$cache_file.2"]) OLDCWD=`pwd` cd exec $CONFIG_SHELL $emacs_srcdir/exec/configure \ @@ -1270,7 +1271,7 @@ packages targeting Android 2.2.])]) # And derive a name for the recursive configure invocation's cache # file if one should be specified for this. - AS_IF([test -n "$cache_file"], + AS_IF([test -n "$cache_file" && test "$cache_file" != "/dev/null"], [passthrough="$passthrough --cache-file=$cache_file.1"]) AS_IF([test "x$with_mailutils" = "xyes"], [emacs_use_mailutils=yes]) -- 2.39.2