On 2020/01/14 15:54:28, dak wrote:
Well, how about diff --git a/autogen.sh b/autogen.sh index 1ca0fc0c0f..c638993f34 100755 --- a/autogen.sh +++ b/autogen.sh @@ -18,7 +18,7 @@ else configure=./configure conf_flags="--srcdir $srcdir $conf_flags" echo "Running autoconf for read-only source directory ..." - autoconf -I "$srcdir" -o "$configure" "$srcdir/configure.ac" ||
exit 1
+ SRCDIR="$srcdir" autoconf -I "$srcdir" -o "$configure"
"$srcdir/configure.ac"
|| exit 1 fi # Autoconf automatically checks its own minimum required # version, and it aborts when the check fails. diff --git a/configure.ac b/configure.ac index bdbc827187..c75e01de9b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,9 @@ dnl Process this file with autoconf to produce a
configure
script. AC_PREREQ(2.60)
# Bootstrap the init process. -AC_INIT +AC_INIT([LilyPond], + [m4_esyscmd_s([. ${SRCDIR:-.}/VERSION; echo $MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL])], + mailto:[bug-lilyp...@gnu.org], [lilypond],
[http://lilypond.org/])
# Bootstrap StepMake configure AC_CONFIG_AUX_DIR([config])
That would seem to cater for Dan's use case reasonably well. Sure,
calling
autoconf from outside of autogen.sh for a read-only source
directory... But at
some point of time, people have to deal with the strange things they
do. IF we really want to continue supporting autoconf in a read-only directory, then this sounds like one of the few possibilities we have. I've added this for now (thanks for your testing efforts!), but it will probably hit us sooner or later... Dan, if you don't want to run autogen.sh with a writable ~/lilypond-src, maybe you can instead copy all files from that directory to a fresh one in the container? https://codereview.appspot.com/549350043/