Index: trunk/ppStats/src/ppStatsVersion.c
===================================================================
--- trunk/ppStats/src/ppStatsVersion.c	(revision 13993)
+++ trunk/ppStats/src/ppStatsVersion.c	(revision 23119)
@@ -1,19 +1,38 @@
 #include "ppStatsInternal.h"
-
-static const char *cvsTag = "$Name: not supported by cvs2svn $";// CVS tag name
 
 psString ppStatsVersion(void)
 {
-    psString version = NULL;            // Version, to return
-    psStringAppend(&version, "%s-%s",PACKAGE_NAME,PACKAGE_VERSION);
-    return version;
+#ifndef PPSTATS_VERSION
+#error "PPSTATS_VERSION is not set"
+#endif
+#ifndef PPSTATS_BRANCH
+#error "PPSTATS_BRANCH is not set"
+#endif
+    return psStringCopy(PPSTATS_BRANCH "@" PPSTATS_VERSION);
+}
+
+psString ppStatsSource(void)
+{
+#ifndef PPSTATS_SOURCE
+#error "PPSTATS_SOURCE is not set"
+#endif
+    return psStringCopy(PPSTATS_SOURCE);
 }
 
 psString ppStatsVersionLong(void)
 {
-    psString version = ppStatsVersion(); // Version, to return
-    psString tag = psStringStripCVS(cvsTag, "Name"); // CVS tag
-    psStringAppend(&version, " (cvs tag %s) %s, %s", tag, __DATE__, __TIME__);
-    psFree(tag);
+    psString version = ppStatsVersion();  // Version, to return
+    psString source = ppStatsSource();    // Source
+
+    psStringPrepend(&version, "ppStats ");
+    psStringAppend(&version, " from %s, built %s, %s", source, __DATE__, __TIME__);
+    psFree(source);
+
+#ifdef __OPTIMIZE__
+    psStringAppend(&version, " optimised");
+#else
+    psStringAppend(&version, " unoptimised");
+#endif
+
     return version;
-}
+};