diff options
| author | Explorer09 <explorer09@gmail.com> | 2018-04-06 23:47:55 +0800 |
|---|---|---|
| committer | Hisham Muhammad <hisham@gobolinux.org> | 2018-08-24 16:00:59 -0300 |
| commit | ebf3cff1acb835ff7938762c36afeada5a05fcf7 (patch) | |
| tree | 3ee720904a6e1a7c4ba993a9b0a83b90fcdb27e6 | |
| parent | 7bbb3600fc6e73e1f27e9aab834f3451b65bf167 (diff) | |
Disable 'make dist' when pkg.m4 is unused in configure
This would prevent a careless future package maintainer from creating a
release tarball with a defective configure script. :)
Also, add a warning in the autogen.sh phase if pkg.m4 is unused.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index b71a9e86..35aa254f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -215,6 +215,13 @@ coverage: cppcheck: cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS +dist-hook: $(top_distdir)/configure + @if grep 'pkg_m4_absent' '$(top_distdir)/configure'; then \ + echo 'configure is generated without pkg.m4. Please supply pkg.m4 and run ./autogen.sh to rebuild the configure script.'>&2; \ + (exit 1); \ + else :; \ + fi + .PHONY: lcov lcov: diff --git a/configure.ac b/configure.ac index de3d04b1..9bbc448b 100644 --- a/configure.ac +++ b/configure.ac @@ -342,7 +342,9 @@ then LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS" AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.]) ], [ - AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.]) + pkg_m4_absent=1 + m4_warning([configure is generated without pkg.m4. 'make dist' target will be disabled.]) + AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.]) ]) fi |