aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac4
-rw-r--r--src/CommandLine.cxx6
2 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 71fdb0e1d..52db236ba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,10 @@ AC_CONFIG_MACRO_DIR([m4])
AC_DEFINE(PROTOCOL_VERSION, "0.19.0", [The MPD protocol version])
+GIT_COMMIT=`GIT_DIR="$srcdir/.git" git describe --dirty --always 2>/dev/null`
+if test x$GIT_COMMIT != x; then
+ AC_DEFINE_UNQUOTED(GIT_COMMIT, ["$GIT_COMMIT"], [The current git commit])
+fi
dnl ---------------------------------------------------------------------------
dnl Programs
diff --git a/src/CommandLine.cxx b/src/CommandLine.cxx
index 59cb53534..33f4917c0 100644
--- a/src/CommandLine.cxx
+++ b/src/CommandLine.cxx
@@ -88,7 +88,11 @@ static constexpr Domain cmdline_domain("cmdline");
gcc_noreturn
static void version(void)
{
- puts("Music Player Daemon " VERSION "\n"
+ puts("Music Player Daemon " VERSION
+#ifdef GIT_COMMIT
+ " (" GIT_COMMIT ")"
+#endif
+ "\n"
"\n"
"Copyright (C) 2003-2007 Warren Dukes <warren.dukes@gmail.com>\n"
"Copyright (C) 2008-2014 Max Kellermann <max@duempel.org>\n"