- use PACKAGE_NAME/PACKAGE_VERSION macros instead PACKAGE/VERSION (AC_INIT() compatibility)
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 e419c78..1b7b873 100644
--- a/unix/vncviewer/vncviewer.cxx
+++ b/unix/vncviewer/vncviewer.cxx
@@ -264,8 +264,8 @@
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 @@
"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 4eb6b22..45d662e 100644
--- a/unix/x0vncserver/x0vncserver.cxx
+++ b/unix/x0vncserver/x0vncserver.cxx
@@ -401,7 +401,7 @@
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"