Avoid unnecessary "touch meson.build" in vpath builds

In e6927270cd I added a 'touch meson.build' to configure.ac, to ensure
conflicts between in-tree configure based builds and meson builds are
automatically detected. Unfortunately I omitted spaces around the condition
restricting this to in-tree builds, leading to touch meson.build to also be
executed in vpath builds. While the only consequence of this buglet is an
unnecessary empty file in build directories, it seems worth backpatching.

Reported-by: Christoph Berg <myon@debian.org>
Discussion: https://postgr.es/m/20240417230002.mb2gv3hyetyn67gk@awork3.anarazel.de
Backpatch: 16-, where the meson based build was added
REL_16_STABLE
Andres Freund 2 years ago
parent a9155efc70
commit 2209c70c65
  1. 2
      configure
  2. 2
      configure.ac

2
configure vendored

@ -20827,6 +20827,6 @@ fi
# Ensure that any meson build directories would reconfigure and see that
# there's a conflicting in-tree build and can error out.
if test "$vpath_build"="no"; then
if test "$vpath_build" = "no"; then
touch meson.build
fi

@ -2500,6 +2500,6 @@ AC_OUTPUT
# Ensure that any meson build directories would reconfigure and see that
# there's a conflicting in-tree build and can error out.
if test "$vpath_build"="no"; then
if test "$vpath_build" = "no"; then
touch meson.build
fi

Loading…
Cancel
Save