X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/a518f63fa0cc139ea006bfb23452fe93abb70964..4fd54ed3c8cedc3f4d3fbe7f51a24eaaaa391aff:/aclocal.glob

diff --git a/aclocal.glob b/aclocal.glob
index 0f5a661..c20cfac 100644
--- a/aclocal.glob
+++ b/aclocal.glob
@@ -38,18 +38,14 @@ dnl 		version number, worked out in some clever way.
 
 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
-      "") ;; *) version="$version+" ;;
-    esac
-  elif cat RELEASE 2>/dev/null; then
-    version=$(cat RELEASE)
-  elif test -f debian/changelog; then
-    version=$(sed -n '/^.*(\(.*\)).*$/ { s::\1:p; q; }' debian/changelog)
-  else
-    echo UNKNOWN
-  fi
-  echo -n $version
+  ver=UNKNOWN
+  for pre in ./ config/; do
+    for post in "" .in; do
+      try=${pre}auto-version${post}
+      if test -x $try; then ver=$("$try"); break; fi
+    done
+  done
+  echo -n "$ver"
 ]))])
 
 dnl --- *@-mdw_LIBTOOL_VERSION_INFO-@* ---
@@ -72,6 +68,24 @@ AC_DEFUN([mdw_LIBTOOL_VERSION_INFO], [
   AC_SUBST([LIBTOOL_VERSION_INFO])
 ])
 
+dnl --- *@-mdw_SILENT_RULES-@* ---
+dnl
+dnl Author:	Mark Wooding
+dnl
+dnl Synopsis:	mdw_SILENT_RULES
+dnl
+dnl Arguments:	---
+dnl
+dnl Use:	Enables the Automake `silent-rules' feature, if available.
+
+AC_DEFUN([mdw_SILENT_RULES], [
+  m4_ifdef([AM_SILENT_RULES], [
+    AM_SILENT_RULES([yes])
+  ], [
+    AC_SUBST([AM_DEFAULT_VERBOSITY], [1])
+  ])
+])
+
 dnl --- *@-mdw_DECL_ENVIRON-@* ---
 dnl
 dnl Author:	Mark Wooding