From ebf3cff1acb835ff7938762c36afeada5a05fcf7 Mon Sep 17 00:00:00 2001 From: Explorer09 Date: Fri, 6 Apr 2018 23:47:55 +0800 Subject: 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 --- Makefile.am | 7 +++++++ configure.ac | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3