Fixed building anopesmtp on Windows, fixed some cmake problems with calculate_depends, and fixed building without gettext

cmake/Anope.cmake

@@ -365,12 +365,12 @@ endmacro(find_includes)
 #   header file dependencies for the given source file.
 ###############################################################################
 macro(calculate_depends SRC SKIP)
-  # Temporarily set that we didn't get a 2nd argument before we actually check if we did get one or not
+  # Temporarily set that we didn't get a 3nd argument before we actually check if we did get one or not
   set(CHECK_ANGLE_INCLUDES FALSE)
-  # Check for a second argument
-  if(${ARGC} GREATER 1)
+  # Check for a third argument
+  if(${ARGC} GREATER 2)
     set(CHECK_ANGLE_INCLUDES TRUE)
-  endif(${ARGC} GREATER 1)
+  endif(${ARGC} GREATER 2)
   # Find all the lines in the given source file that have any form of #include on them, regardless of whitespace, but only if they are valid for the platform we are on
   find_includes(${SRC} INCLUDES)
   # Reset the list of headers to empty

modules/CMakeLists.txt

@@ -53,7 +53,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
       set(SKIP_LIBRARIES)
       # Calculate the library dependencies for the given source file
       calculate_libraries(${SRC} SKIP_LIBRARIES TEMP_LDFLAGS TEMP_DEPENDENCIES)
-      if(NOT SKIP AND NOT SKIP_LIBRARIES)
+      if(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES)
         # Reset has_function
         set(HAS_FUNCTION)
         # Check the function dependencies for the given source file
@@ -86,7 +86,7 @@ foreach(MODULE_FOLDER ${MODULES_FOLDERS})
             DESTINATION data/modules
           )
         endif(HAS_FUNCTION)
-      endif(NOT SKIP AND NOT SKIP_LIBRARIES)
+      endif(NOT SKIP_DEPENDS AND NOT SKIP_LIBRARIES)
     endforeach(SRC)
 
     # Get a list of ALL files and directories within this modules directory

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"

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\")")

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;