diff options
| author | Reuben Thomas <rrt@sc3d.org> | 2018-02-02 23:52:26 +0000 |
|---|---|---|
| committer | Reuben Thomas <rrt@sc3d.org> | 2018-02-03 00:00:44 +0000 |
| commit | e95b1fdb30fc445199ea35d0779d51f03bd4c63b (patch) | |
| tree | d7c854b7e2eade8226eb84a498b0083e994dafa2 /m4 | |
| parent | bf3367126ad3b516c5debeba30d7ce664637fde2 (diff) | |
| download | enchant-e95b1fdb30fc445199ea35d0779d51f03bd4c63b.tar.gz | |
Compute libdir_subdir for the tests properly (fixes issue #185)
This is potentially nasty: the user who reported the issue noticed that the
tests tried to delete their system libraries!
Unfortunately, this requires setting a make variable from a shell
command (unless anyone has a better idea?).
This is not possible in POSIX make.
There is a suggestion to make it possible using the != assignment syntax,
which is already widely supported, but unfortunately automake rejects that
syntax.
Therefore, use $(shell), and use the gnu-make gnulib module to detect GNU
Make; if it is not being used, try setting libdir_subdir=lib, which will
work with default settings.
Document this requirement in INSTALL.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/.gitignore | 1 | ||||
| -rw-r--r-- | m4/gnulib-cache.m4 | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/m4/.gitignore b/m4/.gitignore index 4b92c1b..7ede777 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -56,3 +56,4 @@ /rawmemchr.m4 /strchrnul.m4 /manywarnings-c++.m4 +/gnu-make.m4 diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4 index 101df4f..7351b3f 100644 --- a/m4/gnulib-cache.m4 +++ b/m4/gnulib-cache.m4 @@ -27,7 +27,7 @@ # Specification in the form of a command-line invocation: -# gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl bootstrap c99 configmake flock manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests +# gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl bootstrap c99 configmake flock gnu-make manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests # Specification in the form of a few gnulib-tool.m4 macro invocations: gl_LOCAL_DIR([gl:gl-mod/bootstrap]) @@ -36,6 +36,7 @@ gl_MODULES([ c99 configmake flock + gnu-make manywarnings relocatable-lib-lgpl snippet/unused-parameter |