summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac4
2 files changed, 10 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index cd5209c0..7d19600f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -210,6 +210,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 2c4fc5be..ffd8fede 100644
--- a/configure.ac
+++ b/configure.ac
@@ -292,7 +292,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