summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2012-02-10 12:09:48 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2012-06-25 11:55:26 +0100
commitf51a9648ff1a893cecd34136adff02168db8b689 (patch)
tree908c625405b163883ed43825dc63faf5d4adb51f
parente1427a2d662ca18cff5beb2dddd8490891d02a9f (diff)
downloaddbus-f51a9648ff1a893cecd34136adff02168db8b689.tar.gz
Enable Automake maintainer mode by default, but let distros disable it
See http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ for more information. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34671 Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac4
2 files changed, 4 insertions, 2 deletions
diff --git a/autogen.sh b/autogen.sh
index f66e7781..15581120 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -101,7 +101,7 @@ else
fi
if $run_configure; then
- $srcdir/configure --enable-maintainer-mode --enable-developer --config-cache "$@"
+ $srcdir/configure --enable-developer --config-cache "$@"
echo
echo "Now type 'make' to compile $PROJECT."
else
diff --git a/configure.ac b/configure.ac
index 9feebfc2..52d23177 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,9 @@ GETTEXT_PACKAGE=dbus-1
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain])
-AM_MAINTAINER_MODE
+# By default, rebuild autotools files on demand; only use ./missing if the
+# user says --disable-maintainer-mode (some distributions like to do this)
+AM_MAINTAINER_MODE([enable])
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])