Made gettext work on most OSs. Tested on Debian, FreeBSD, Gentoo, and Windows.

Added a search path option to the Config script for cmake to use when finding libraries for modules or for gettext.
Fixed m_mysql and m_ssl to work under Windows, made the Windows Config
program remember the last used options, and fixed Windows release builds.

7 files changed, 17 insertions, 14 deletions

diff --git a/include/extern.h b/include/extern.h
index 496c1caca..c1d01d79f 100644
--- a/include/extern.h
+++ b/include/extern.h
@@ -155,10 +155,11 @@ E void pmodule_ircd_var(IRCDVar *ircdvar);
 /**** language.cpp ****/
 E std::vector<Anope::string> languages;
 E void InitLanguages();
-E const Anope::string GetString(Anope::string language, LanguageString string);
+E const Anope::string GetString(const Anope::string &language, LanguageString string);
 E const Anope::string GetString(LanguageString string);
 E const Anope::string GetString(const NickCore *nc, LanguageString string);
 E const Anope::string GetString(const User *u, LanguageString string);
+E const Anope::string GetString(const char *domain, Anope::string language, const Anope::string &string);
 E Anope::string language_strings[LANG_STRING_COUNT];
 E void SyntaxError(BotInfo *bi, User *u, const Anope::string &command, LanguageString message);
 
@@ -190,7 +191,7 @@ E void sighandler(int signum);
 E void do_restart_services();
 
 /* The socket to our uplink */
-class UplinkSocket : public ConnectionSocket
+class CoreExport UplinkSocket : public ConnectionSocket
 {
  public:
 	UplinkSocket(bool ipv6 = false);
diff --git a/include/modes.h b/include/modes.h
index e938a65c6..0611306e9 100644
--- a/include/modes.h
+++ b/include/modes.h
@@ -359,11 +359,11 @@ class StackerInfo
 	BotInfo *bi;
 
 	/** Add a mode to this object
-	 * @param Mode The mode
+	 * @param mode The mode
 	 * @param Set true if setting, false if unsetting
 	 * @param Param The param for the mode
 	 */
-	void AddMode(Base *Mode, bool Set, const Anope::string &Param);
+	void AddMode(Mode *mode, bool Set, const Anope::string &Param);
 };
 
 /** This is mode manager
@@ -393,12 +393,12 @@ class CoreExport ModeManager
 	/** Really add a mode to the stacker, internal use only
 	 * @param bi The client to set the modes from
 	 * @param Object The object, user/channel
-	 * @param Mode The mode
+	 * @param mode The mode
 	 * @param Set Adding or removing?
 	 * @param Param A param, if there is one
 	 * @param Type The type this is, user or channel
 	 */
-	static void StackerAddInternal(BotInfo *bi, Base *Object, Base *Mode, bool Set, const Anope::string &Param, StackerType Type);
+	static void StackerAddInternal(BotInfo *bi, Base *Object, Mode *mode, bool Set, const Anope::string &Param, StackerType Type);
 
  public:
 	/* List of all modes Anope knows about */
diff --git a/include/modules.h b/include/modules.h
index 7a0d02269..efe2441a5 100644
--- a/include/modules.h
+++ b/include/modules.h
@@ -1223,7 +1223,7 @@ class CallBack : public Timer
 	}
 };
 
-class Service : public virtual Base
+class CoreExport Service : public virtual Base
 {
  public:
 	Module *owner;
diff --git a/include/services.h b/include/services.h
index fd4cc80ee..d1dca8724 100644
--- a/include/services.h
+++ b/include/services.h
@@ -81,6 +81,7 @@
 # define unsetenv(x) SetEnvironmentVariable(x, NULL)
 # define MARK_DEPRECATED
 
+extern CoreExport USHORT WindowsGetLanguage(const char *lang);
 extern CoreExport int inet_pton(int af, const char *src, void *dst);
 extern CoreExport const char *inet_ntop(int af, const void *src, char *dst, size_t size);
 #endif
@@ -482,7 +483,7 @@ class Memo : public Flags<MemoFlag>
 	Anope::string text;
 };
 
-struct MemoInfo
+struct CoreExport MemoInfo
 {
 	unsigned memomax;
 	std::vector<Memo *> memos;
diff --git a/include/sockets.h b/include/sockets.h
index 04912984b..2c3ddb94d 100644
--- a/include/sockets.h
+++ b/include/sockets.h
@@ -114,7 +114,7 @@ class ClientSocket;
 class ListenSocket;
 class ConnectionSocket;
 
-class SocketIO
+class CoreExport SocketIO
 {
  public:
 	/** Receive something from the buffer
@@ -306,7 +306,7 @@ class CoreExport ListenSocket : public Socket
 	virtual ClientSocket *OnAccept(int fd, const sockaddrs &addr);
 };
 
-class ConnectionSocket : public BufferedSocket
+class CoreExport ConnectionSocket : public BufferedSocket
 {
  public:
 	/* Sockaddrs for bindip (if there is one) */
diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake
index 1509ab5d7..cf0b5d466 100644
--- a/include/sysconf.h.cmake
+++ b/include/sysconf.h.cmake
@@ -20,6 +20,7 @@
 #cmakedefine HAVE_EVENTFD 1
 #cmakedefine GETTEXT_FOUND 1
 #cmakedefine RUNGROUP "@RUNGROUP@"
+#define LIBINTL "@LIBINTL_INCLUDE@"
 
 #cmakedefine HAVE_UINT8_T 1
 #cmakedefine HAVE_U_INT8_T 1
diff --git a/include/threadengine.h b/include/threadengine.h
index 764c26242..8df288cae 100644
--- a/include/threadengine.h
+++ b/include/threadengine.h
@@ -17,7 +17,7 @@ class Thread;
 
 extern CoreExport ThreadEngine threadEngine;
 
-class ThreadEngine
+class CoreExport ThreadEngine
 {
  public:
 	/* Vector of threads */
@@ -41,7 +41,7 @@ class ThreadEngine
 	void Process();
 };
 
-class Thread : public Extensible
+class CoreExport Thread : public Extensible
 {
  private:
 	/* Set to true to tell the thread to finish and we are waiting for it */
@@ -77,7 +77,7 @@ class Thread : public Extensible
 	virtual void Run();
 };
 
-class Mutex
+class CoreExport Mutex
 {
  protected:
 	/* A mutex, used to keep threads in sync */
@@ -101,7 +101,7 @@ class Mutex
 	void Unlock();
 };
 
-class Condition : public Mutex
+class CoreExport Condition : public Mutex
 {
  private:
 	/* A condition */