From a518f63fa0cc139ea006bfb23452fe93abb70964 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Wed, 17 Dec 2008 12:12:03 +0000 Subject: [PATCH] aclocal/mdw_AUTO_VERSION: Tweak unpleasant AC_DEFUN hack. Later versions (1.10.1, for example) of aclocal don't notice AC_DEFUNs which are commented out. Simple answer: don't comment it, just override it immediately. This seems to work. --- aclocal.glob | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/aclocal.glob b/aclocal.glob index 283f695..0f5a661 100644 --- a/aclocal.glob +++ b/aclocal.glob @@ -36,7 +36,7 @@ dnl dnl Use: Defines an m4 macro AUTO_VERSION which contains the current dnl version number, worked out in some clever way. -dnl AC_DEFUN([mdw_AUTO_VERSION], [nobody cares...]) +AC_DEFUN([mdw_AUTO_VERSION], [nobody cares...]) m4_define([mdw_AUTO_VERSION], [m4_define([AUTO_VERSION], m4_esyscmd([ if test -d .git && version=$(git describe --abbrev=4 2>/dev/null); then case "$(git diff-index --name-only HEAD)" in diff --git a/debian/changelog b/debian/changelog index 8c25f60..b376ce0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +cfd (1.3.3) experimental; urgency=low + + * Fix ugly hack for mdw_AUTO_VERSION to work with newer (e.g., 1.10) + versions of aclocal. + + -- Mark Wooding Wed, 17 Dec 2008 12:15:27 +0000 + cfd (1.3.2) experimental; urgency=low * Add new files for Autotest support. -- 2.11.0