diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-04-19 12:35:40 +0100 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2010-07-19 01:21:14 +0100 |
| commit | 47afd190b37d480d04da9c15d0232985837ba27b (patch) | |
| tree | 083fa4f4b88cfb3a9d0b686e8bf90b7e450bbb6e | |
| parent | 9f3f8a7c2e26f2720c9f86e9c10a8ae59cb614f1 (diff) | |
Report git version in XWingit-describe-in-log
| -rwxr-xr-x | hw/xwin/winprocarg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c index 66a0503f2..47286fab1 100755 --- a/hw/xwin/winprocarg.c +++ b/hw/xwin/winprocarg.c @@ -35,6 +35,7 @@ from The Open Group. #define VENDOR_CONTACT BUILDERADDR #endif #include <../xfree86/common/xorgVersion.h> +#include <xorg-git-version.h> #include "win.h" #include "winconfig.h" #include "winprefs.h" @@ -1250,8 +1251,11 @@ winLogVersionInfo (void) ErrorF ("Welcome to the XWin X Server\n"); ErrorF ("Vendor: %s\n", VENDOR_STRING); ErrorF ("Release: %d.%d.%d.%d (%d)\n", XORG_VERSION_MAJOR, XORG_VERSION_MINOR, XORG_VERSION_PATCH, XORG_VERSION_SNAP, XORG_VERSION_CURRENT); - ErrorF ("%s\n\n", BUILDERSTRING); + if (strlen(BUILDERSTRING)) ErrorF ("%s\n", BUILDERSTRING); ErrorF ("Contact: %s\n", VENDOR_CONTACT); +#ifdef XORG_GIT_VERSION + ErrorF ("git version: " XORG_GIT_VERSION "\n"); +#endif } /* |