Move the last remnants of autotools into config.h.

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

CMakeLists.txt

@@ -35,11 +35,6 @@ set(BIN_DIR "${CMAKE_INSTALL_PREFIX}")
 set(DOC_DIR "${CMAKE_INSTALL_PREFIX}")
 endif()
 
-# Compatibility variables for the migration from autotools
-add_definitions(-DPACKAGE_NAME="${CMAKE_PROJECT_NAME}")
-add_definitions(-DPACKAGE_VERSION="${VERSION}")
-add_definitions(-DLOCALEDIR="${LOCALE_DIR}")
-
 if(MSVC)
   message(FATAL_ERROR "TigerVNC cannot be built with Visual Studio.  Please use MinGW")
 endif()

config.h.in

@@ -1,3 +1,6 @@
+#define PACKAGE_NAME "@CMAKE_PROJECT_NAME@"
+#define PACKAGE_VERSION "@VERSION@"
+
 #cmakedefine HAVE_SOCKLEN_T
 #cmakedefine HAVE_INET_ATON
 #cmakedefine HAVE_INET_NTOP
@@ -23,6 +26,7 @@
 #cmakedefine HAVE_PAM
 
 #cmakedefine DATA_DIR "@DATA_DIR@"
+#cmakedefine LOCALE_DIR "@LOCALE_DIR@"
 
 /* MS Visual Studio 2008 and newer doesn't know ssize_t */
 #if defined(HAVE_GNUTLS) && defined(WIN32) && !defined(__MINGW32__)

vncviewer/vncviewer.cxx

@@ -273,7 +273,7 @@ int main(int argc, char** argv)
                                  "See http://www.tigervnc.org for information on TigerVNC.");
 
   setlocale(LC_ALL, "");
-  bindtextdomain(PACKAGE_NAME, LOCALEDIR);
+  bindtextdomain(PACKAGE_NAME, LOCALE_DIR);
   textdomain(PACKAGE_NAME);
 
   rfb::SecurityClient::setDefaults();