- use PACKAGE_NAME/PACKAGE_VERSION macros instead PACKAGE/VERSION (AC_INIT() compatib...

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/branches/1.5-xserver@2489 3789f03b-4d11-0410-bbf8-ca57d06f2519

diff --git a/unix/vncviewer/vncviewer.cxx b/unix/vncviewer/vncviewer.cxx
index e419c78bd7f3a522983cedb2e286fcaded469ee1..1b7b8734090ec762f9c0c34dee777e3a49d0f28f 100644 (file)
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -264,8 +264,8 @@ createTunnel (const char *gatewayHost, const char *remoteHost,
 int main(int argc, char** argv)
 {
   setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE, LOCALEDIR);
-  textdomain(PACKAGE);
+  bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+  textdomain(PACKAGE_NAME);
 
   snprintf(aboutText, sizeof(aboutText), 
            _("TightVNC Viewer for X version %s - built %s\n"
@@ -273,10 +273,10 @@ int main(int argc, char** argv)
              "Copyright (C) 2000-2006 TightVNC Group\n"
              "Copyright (C) 2004-2005 Peter Astrand, Cendio AB\n"
              "See http://www.tightvnc.com for information on TightVNC."),
-           VERSION, buildtime);
+           PACKAGE_VERSION, buildtime);
   fprintf(stderr,"\n%s\n", aboutText);
 
-  bind_textdomain_codeset(PACKAGE, "iso-8859-1");
+  bind_textdomain_codeset(PACKAGE_NAME, "iso-8859-1");
 
   rfb::initStdIOLoggers();
   rfb::LogWriter::setLogParams("*:stderr:30");

diff --git a/unix/x0vncserver/x0vncserver.cxx b/unix/x0vncserver/x0vncserver.cxx
index 4eb6b226168fdd86abd4183149872292e9cbe847..45d662e12484981a7864505cbb5185fac48045fc 100644 (file)
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -401,7 +401,7 @@ char* programName;
 static void usage()
 {
   fprintf(stderr, "TightVNC Server version %s, built %s\n\n",
-          VERSION, buildtime);
+          PACKAGE_VERSION, buildtime);
   fprintf(stderr, "Usage: %s [<parameters>]\n", programName);
   fprintf(stderr,"\n"
           "Parameters can be turned on with -<param> or off with -<param>=0\n"