From 3edc6d70b9b7d3da642f46c90a876a606ba76ab3 Mon Sep 17 00:00:00 2001
From: Adam <Adam@anope.org>
Date: Mon, 1 Nov 2010 16:07:18 -0400
Subject: Fixed building anopesmtp on Windows, fixed some cmake problems with
 calculate_depends, and fixed building without gettext

---
 src/language.cpp         | 5 ++---
 src/tools/CMakeLists.txt | 9 ++++-----
 src/win32/Config.cs      | 3 ++-
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/language.cpp b/src/language.cpp
index 91b959e3a..2b63f0103 100644
--- a/src/language.cpp
+++ b/src/language.cpp
@@ -112,9 +112,9 @@ const Anope::string GetString(const char *domain, Anope::string language, const
 	return translated;
 }
 #else
-const Anope::string GetString(const char *domain, const Anope::string &language, const Anope::string &string)
+const Anope::string GetString(const char *domain, Anope::string language, const Anope::string &string)
 {
-	return language_strings[string];
+	return string;
 }
 #endif
 
@@ -4671,7 +4671,6 @@ Anope::string language_strings[LANG_STRING_COUNT] = {
 	"Sets various global Services options.  Option names\n"
 	"currently defined are:\n"
 	"    READONLY   Set read-only or read-write mode\n"
-	"    LOGCHAN    Report log messages to a channel\n"
 	"    DEBUG      Activate or deactivate debug mode\n"
 	"    NOEXPIRE   Activate or deactivate no expire mode\n"
 	"    SUPERADMIN Activate or deactivate super-admin mode\n"
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index 386591c42..081470766 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -19,6 +19,10 @@ foreach(SRC ${TOOLS_SRCS})
     add_executable(${EXE} ${SRC})
     set_target_properties(${EXE} PROPERTIES LINKER_LANGUAGE CXX LINK_FLAGS "${LDFLAGS}")
     add_dependencies(${EXE} ${PROGRAM_NAME})
+    # Only for Windows, set anopesmtp to require the wsock32 library
+    if(WIN32 AND ${EXE} STREQUAL anopesmtp)
+      target_link_libraries(${EXE} wsock32)
+    endif(WIN32 AND ${EXE} STREQUAL anopesmtp)
     # Set the executable to be installed to the bin directory under the main directory
     install(TARGETS ${EXE}
       DESTINATION bin
@@ -30,11 +34,6 @@ foreach(SRC ${TOOLS_SRCS})
   endif(NOT SKIP)
 endforeach(SRC)
 
-# Only for Windows, set anopesmtp to require the wsock32 library
-if(WIN32)
-  target_link_libraries(anopesmtp wsock32)
-endif(WIN32)
-
 # On non-Windows platforms, if RUNGROUP is set, change the permissions of the tools directory
 if(NOT WIN32 AND RUNGROUP)
   install(CODE "execute_process(COMMAND ${CHMOD} 2770 \"\${CMAKE_INSTALL_PREFIX}/bin\")")
diff --git a/src/win32/Config.cs b/src/win32/Config.cs
index fd1cbbfda..858aef7e8 100644
--- a/src/win32/Config.cs
+++ b/src/win32/Config.cs
@@ -220,7 +220,8 @@ namespace Config
 				if (CacheResponse != null && (InstallerResponse == null || InstallerResponse.Length < 1))
 					InstallerResponse = CacheResponse;
 
-				if (InstallerResponse == null || InstallerResponse.Length < 1)
+				// Question 4 is optional
+				if (i != 4 && (InstallerResponse == null || InstallerResponse.Length < 1))
 				{
 					Console.WriteLine("Invlaid option");
 					--i;
-- 
cgit