From 6b852a2f0f3df20702e44b1f6068661673ae9e3c Mon Sep 17 00:00:00 2001
From: James Booth <boothj5@gmail.com>
Date: Tue, 17 Sep 2013 01:08:12 +0100
Subject: [PATCH] Include git revision with -v output

---
 Makefile.am |  2 +-
 src/main.c  | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9a4c96d5..9da258eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ with_git_sources = $(core_sources)
 endif
 
 bin_PROGRAMS = profanity
-profanity_SOURCES = $(main_source) $(with_git_sources)
+profanity_SOURCES = $(with_git_sources) $(main_source)
 
 TESTS = tests/testsuite
 check_PROGRAMS = tests/testsuite
diff --git a/src/main.c b/src/main.c
index 99f71351..253c9237 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,10 +19,13 @@
  * along with Profanity.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
+#include <string.h>
 #include <glib.h>
 
 #include "config.h"
+#ifdef HAVE_GIT_VERSION
+#include "gitversion.c"
+#endif
 
 #include "profanity.h"
 
@@ -55,7 +58,17 @@ main(int argc, char **argv)
     g_option_context_free(context);
 
     if (version == TRUE) {
-        g_print("Profanity, version %s\n", PACKAGE_VERSION);
+
+        if (strcmp(PACKAGE_STATUS, "development") == 0) {
+#ifdef HAVE_GIT_VERSION
+            g_print("Profanity, version %sdev.%s.%s\n", PACKAGE_VERSION, PROF_GIT_BRANCH, PROF_GIT_REVISION);
+#else
+            g_print("Profanity, version %sdev\n", PACKAGE_VERSION);
+#endif
+        } else {
+            g_print("Profanity, version %s\n", PACKAGE_VERSION);
+        }
+
         g_print("Copyright (C) 2012, 2013 James Booth <%s>.\n", PACKAGE_BUGREPORT);
         g_print("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
         g_print("\n");