On Jul 16, 09 14:34:41 +1000, Peter Hutterer wrote:
From: Gaetan Nadon
Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Global maintenance on all modules
Signed-off-by: Peter Hutterer
Hm. I don't see the advantage ATM, and it has the big disadvantage that you need to have a very recent xorg-macros for autoconfig. Even the latest released openSUSE (11.1) doesn't have that. I'll keep the patch in my inbox and will apply it when it seems fit. But thanks for notifying!
--- Makefile.am | 3 +-- configure.ac | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am index 534c3fd..d254b4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,8 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
-# "git log" with the space should be available since git 1.3.0 ChangeLog: - (GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2) + $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac index c2f06cf..d5c6fa7 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,9 @@ AM_MAINTAINER_MODE
AC_CONFIG_FILES([shave shave-libtool])
+# Require xorg-macros: XORG_CHANGELOG +m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])]) +XORG_MACROS_VERSION(1.2)
# Program checks. AC_DISABLE_STATIC @@ -355,6 +358,7 @@ m4_pattern_forbid([XORG_MANPAGE_SECTIONS])dnl XORG_MANPAGE_SECTIONS m4_pattern_forbid([XORG_RELEASE_VERSION])dnl XORG_RELEASE_VERSION +XORG_CHANGELOG
dnl These are also defined in XORG_RELEASE_VERSION since 2006-11-30. dnl So we check whether XORG_RELEASE_VERSION has already done this -- 1.6.3.rc1.2.g0164.dirty
Matthias
--
Matthias Hopf