Merged changes from branches/1.5-xserver (revision range 2432:2631) back to trunk.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@2829 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --cc unix/x0vncserver/x0vncserver.cxx
index 830e494c2add104eba37a866c25d1a06d8cb8378,45d662e12484981a7864505cbb5185fac48045fc..55a599161392995f1aeca6a471c2b57f777e97f0
--- 1/unix/x0vncserver/x0vncserver.cxx
--- 2/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@@ -369,17 -398,11 +369,17 @@@ private
  
  char* programName;
  
 -static void usage()
 +static void printVersion(FILE *fp)
  {
 -  fprintf(stderr, "TightVNC Server version %s, built %s\n\n",
 +  fprintf(fp, "TightVNC Server version %s, built %s\n",
-           VERSION, buildtime);
+           PACKAGE_VERSION, buildtime);
 -  fprintf(stderr, "Usage: %s [<parameters>]\n", programName);
 +}
 +
 +static void usage()
 +{
 +  printVersion(stderr);
 +  fprintf(stderr, "\nUsage: %s [<parameters>]\n", programName);
 +  fprintf(stderr, "       %s --version\n", programName);
    fprintf(stderr,"\n"
            "Parameters can be turned on with -<param> or off with -<param>=0\n"
            "Parameters which take a value can be specified as "