diff options
| author | Werner Koch <wk@gnupg.org> | 2017-03-01 18:40:05 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2017-03-01 18:40:05 +0100 |
| commit | 246b27921b5dc34f367d879402725784aaee2494 (patch) | |
| tree | fca8ace2d5cb8ff21ccf7e7cc15809d09d3ad18f /configure.ac | |
| parent | po: Auto-update (diff) | |
| download | gnupg2-246b27921b5dc34f367d879402725784aaee2494.tar.xz gnupg2-246b27921b5dc34f367d879402725784aaee2494.zip | |
build: Add kludge for "make distcheck" in a release build.
* configure.ac: New option --enable-gnupg-builddir-envvar.
(ENABLE_GNUPG_BUILDDIR_ENVVAR): New ac_define.
* common/homedir.c (gnupg_set_builddir_from_env): Consider
ENABLE_GNUPG_BUILDDIR_ENVVAR.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Rename to ...
(AM_DISTCHECK_CONFIGURE_FLAGS): this to be future proof. Add option
--enable-gnupg-builddir-envvar.
--
Our regression test suite makes use of the envvar GNUPG_BUILDDIR. Now
the code in gnupg for evaluating this envvar is only included in a
development version (that is one with a "-betaNNN" suffix). For a
real release the envvar is not considered. However during a "make
distcheck" a "make check" is done for the build directory. Without
defining that envar we would try to run binaries in the install
directory ("_inst" sub-directory) which are not yet installed at that
time.
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1733c5ad7..4b9ceca2f 100644 --- a/configure.ac +++ b/configure.ac @@ -1693,6 +1693,21 @@ AC_ARG_ENABLE(optimization, fi]) # +# We do not want support for the GNUPG_BUILDDIR environment variable +# in a released version. However, our regression tests suite requires +# this and thus we build with support for it during "make distcheck". +# This configure option implements this along with the top Makefile's +# AM_DISTCHECK_CONFIGURE_FLAGS. +# +gnupg_builddir_envvar=no +AC_ARG_ENABLE(gnupg-builddir-envvar,, + gnupg_builddir_envvar=$enableval) +if test x"$gnupg_builddir_envvar" = x"yes"; then + AC_DEFINE(ENABLE_GNUPG_BUILDDIR_ENVVAR, 1, + [This is only used with "make distcheck"]) +fi + +# # Add user CFLAGS. # CFLAGS="$CFLAGS $CFLAGS_orig" |