Revision: 4879
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4879&view=rev
Author: ossman_
Date: 2012-03-27 13:03:22 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
Move the last remnants of autotools into config.h.
Modified Paths:
--------------
trunk/CMakeLists.txt
trunk/config.h.in
trunk/vncviewer/vncviewer.cxx
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2012-03-27 12:50:54 UTC (rev 4878)
+++ trunk/CMakeLists.txt 2012-03-27 13:03:22 UTC (rev 4879)
@@ -35,11 +35,6 @@
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()
Modified: trunk/config.h.in
===================================================================
--- trunk/config.h.in 2012-03-27 12:50:54 UTC (rev 4878)
+++ trunk/config.h.in 2012-03-27 13:03:22 UTC (rev 4879)
@@ -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__)
Modified: trunk/vncviewer/vncviewer.cxx
===================================================================
--- trunk/vncviewer/vncviewer.cxx 2012-03-27 12:50:54 UTC (rev 4878)
+++ trunk/vncviewer/vncviewer.cxx 2012-03-27 13:03:22 UTC (rev 4879)
@@ -273,7 +273,7 @@
"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();
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here
http://p.sf.net/sfu/sfd2d-msazure
_______________________________________________
Tigervnc-commits mailing list
Tigervnc-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
