summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GNUmakefile2
-rw-r--r--configure.ac7
2 files changed, 9 insertions, 0 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 49e41b7ff..2fce1fdb7 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -75,6 +75,8 @@ all:
@echo "You must run ./configure before running \`make'." 1>&2
@exit 1
+check dist distcheck install: all
+
endif
# Tell version 3.79 and up of GNU make to not build goals in this
diff --git a/configure.ac b/configure.ac
index 5c332dbb9..66082783d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -333,6 +333,13 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES])
AM_GNU_GETTEXT([external], [need-formatstring-macros])
AM_GNU_GETTEXT_VERSION([0.15])
+dnl Allow maintainer rules under GNU make even in VPATH builds. This does
+dnl not work in autoconf 2.61 or earlier, but we don't want to require
+dnl non-maintainers to use unreleased autoconf, hence the version test.
+dnl TODO remove the version check once autoconf 2.62 is released.
+m4_if(m4_version_compare([2.61a.100], m4_defn([AC_AUTOCONF_VERSION])), [1], [],
+ [AC_CONFIG_LINKS([GNUmakefile:GNUmakefile])])
+
AC_CONFIG_FILES(
Makefile
doc/Makefile