summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2009-07-08 10:03:40 -0400
committerPeter Hutterer <peter.hutterer@who-t.net>2009-07-11 20:43:23 +1000
commit961dbcda7fcfd15a3e60bfb905f05286ba33508f (patch)
tree161b6442c0fca1f119dae194ce436ea1f2589dec
parent2ffb32d61cbed1452d67abb2028ac13910550392 (diff)
compositeproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
Build break: Makefile.am: command not found: git-log Adding the macro in configure.ac and use it in Makefile.am Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611 Tested: running autogen.sh, make and 'make dist' Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac5
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 105a360..4f4da59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
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 3a5fc5e..7fa9070 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,12 @@ AC_INIT([CompositeProto], [0.4], [https://bugs.freedesktop.org/enter_bug.cgi?pro
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_RELEASE_VERSION 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)
+
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
compositeproto.pc])