add smod everywhere

git-svn-id: http://libproxy.googlecode.com/svn/trunk@544 c587cffe-e639-0410-9787-d7902ae8ed56

14 files changed, 28 insertions, 27 deletions

diff --git a/libmodman/module.hpp b/libmodman/module.hpp
index ef339f9..39cab52 100644
--- a/libmodman/module.hpp
+++ b/libmodman/module.hpp
@@ -36,10 +36,10 @@
 #define MM_MODULE_DEFINE __MOD_DEF_PREFIX struct libmodman::module __MM_DLL_EXPORT MM_MODULE_NAME[]
 
 #define MM_MODULE_LAST { MM_MODULE_VERSION, NULL, NULL, NULL, NULL, NULL }
-#define MM_MODULE_RECORD(type, init, test, symb) \
-	{ MM_MODULE_VERSION, type::base_type(), init, test, symb, NULL }
+#define MM_MODULE_RECORD(type, init, test, symb, smod) \
+	{ MM_MODULE_VERSION, type::base_type(), init, test, symb, smod }
 
-#define MM_MODULE_EZ(clsname, cond, symb) \
+#define MM_MODULE_EZ(clsname, cond, symb, smod) \
 	static bool clsname ## _test() { \
 		return (cond); \
 	} \
@@ -50,7 +50,7 @@
 		return retval; \
 	} \
 	MM_MODULE_DEFINE = { \
-		MM_MODULE_RECORD(clsname, clsname ## _init, clsname ## _test, symb), \
+		MM_MODULE_RECORD(clsname, clsname ## _init, clsname ## _test, symb, smod), \
 		MM_MODULE_LAST, \
 	};
 
diff --git a/libmodman/test/CMakeLists.txt b/libmodman/test/CMakeLists.txt
index aa8ff61..a077866 100644
--- a/libmodman/test/CMakeLists.txt
+++ b/libmodman/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 ### Functions

-function(mm_create_module MODTYPE MODNAME MODCOND MODSYMB)

+function(mm_create_module MODTYPE MODNAME MODCOND MODSYMB MODSMOD)

   configure_file(modules/module.cpp.in libmodman/test/${MODTYPE}_${MODNAME}.cpp @ONLY)

   if(NOT IS_DIRECTORY modules/${MODTYPE})

     file(MAKE_DIRECTORY modules/${MODTYPE})

@@ -20,17 +20,18 @@ function(mm_create_program name EXTTYPE)
 endfunction(mm_create_program)

 

 ### Modules

-mm_create_module(condition one false NULL)

-mm_create_module(condition two true  NULL)

-mm_create_module(singleton one true  NULL)

-mm_create_module(singleton two true  NULL)

-mm_create_module(sorted    one true  NULL)

-mm_create_module(sorted    two true  NULL)

-mm_create_module(symbol    one true  \"asdfoia\")

+mm_create_module(condition one false NULL        NULL)

+mm_create_module(condition two true  NULL        NULL)

+mm_create_module(singleton one true  NULL        NULL)

+mm_create_module(singleton two true  NULL        NULL)

+mm_create_module(sorted    one true  NULL        NULL)

+mm_create_module(sorted    two true  NULL        NULL)

 if (WIN32)

-mm_create_module(symbol    two true  \"recv\")

+mm_create_module(symbol    one true  \"asdfoia\" \"ws2_32\")

+mm_create_module(symbol    two true  \"recv\"    \"ws2_32\")

 else()

-mm_create_module(symbol    two true  \"deflate\")

+mm_create_module(symbol    one true  \"asdfoia\" \"z\")

+mm_create_module(symbol    two true  \"deflate\" \"z\")

 endif()

 

 ### Programs

diff --git a/libmodman/test/modules/module.cpp.in b/libmodman/test/modules/module.cpp.in
index edfc143..41ccd25 100644
--- a/libmodman/test/modules/module.cpp.in
+++ b/libmodman/test/modules/module.cpp.in
@@ -21,4 +21,4 @@
 #include <libmodman/module.hpp>
 
 class @MODNAME@ : public @MODTYPE@_extension {};
-MM_MODULE_EZ(@MODNAME@, @MODCOND@, @MODSYMB@);
+MM_MODULE_EZ(@MODNAME@, @MODCOND@, @MODSYMB@, @MODSMOD@);
diff --git a/libproxy/extension_pacrunner.hpp b/libproxy/extension_pacrunner.hpp
index 00100e8..7af5215 100644
--- a/libproxy/extension_pacrunner.hpp
+++ b/libproxy/extension_pacrunner.hpp
@@ -23,14 +23,14 @@
 #include <libmodman/module.hpp>
 #include "url.hpp"
 
-#define PX_PACRUNNER_MODULE_EZ(name, cond, symb) \
+#define PX_PACRUNNER_MODULE_EZ(name, cond, symb, smod) \
 	class name ## _pacrunner_extension : public pacrunner_extension { \
 	protected: \
 		virtual pacrunner* create(string pac, const url& pacurl) throw (bad_alloc) { \
 			return new name ## _pacrunner(pac, pacurl); \
 		} \
 	}; \
-	MM_MODULE_EZ(name ## _pacrunner_extension, cond, symb)
+	MM_MODULE_EZ(name ## _pacrunner_extension, cond, symb, smod)
 
 namespace libproxy {
 using namespace std;
diff --git a/libproxy/modules/config_envvar.cpp b/libproxy/modules/config_envvar.cpp
index 4c5f6a0..9fb9ccd 100644
--- a/libproxy/modules/config_envvar.cpp
+++ b/libproxy/modules/config_envvar.cpp
@@ -62,4 +62,4 @@ public:
 	}
 };
 
-MM_MODULE_EZ(envvar_config_extension, true, NULL);
+MM_MODULE_EZ(envvar_config_extension, true, NULL, NULL);
diff --git a/libproxy/modules/config_gnome.cpp b/libproxy/modules/config_gnome.cpp
index 69e87d9..4233aaf 100644
--- a/libproxy/modules/config_gnome.cpp
+++ b/libproxy/modules/config_gnome.cpp
@@ -268,6 +268,6 @@ static base_extension** gnome_config_extension_init() {
 }
 
 MM_MODULE_DEFINE = {
-		MM_MODULE_RECORD(gnome_config_extension, gnome_config_extension_init, gnome_config_extension_test, NULL),
+		MM_MODULE_RECORD(gnome_config_extension, gnome_config_extension_init, gnome_config_extension_test, NULL, NULL),
 		MM_MODULE_LAST,
 };
diff --git a/libproxy/modules/config_kde4.cpp b/libproxy/modules/config_kde4.cpp
index 3e9921d..1eb82b9 100644
--- a/libproxy/modules/config_kde4.cpp
+++ b/libproxy/modules/config_kde4.cpp
@@ -121,4 +121,4 @@ private:
 */
 };
 
-MM_MODULE_EZ(kde_config_extension, xhasclient("kicker", NULL), NULL);
+MM_MODULE_EZ(kde_config_extension, xhasclient("kicker", NULL), NULL, NULL);
diff --git a/libproxy/modules/ignore_domain.cpp b/libproxy/modules/ignore_domain.cpp
index a24caf9..fb033b7 100644
--- a/libproxy/modules/ignore_domain.cpp
+++ b/libproxy/modules/ignore_domain.cpp
@@ -56,4 +56,4 @@ public:
 	}
 };
 
-MM_MODULE_EZ(domain_ignore_extension, true, NULL);
+MM_MODULE_EZ(domain_ignore_extension, true, NULL, NULL);
diff --git a/libproxy/modules/ignore_hostname.cpp b/libproxy/modules/ignore_hostname.cpp
index 578c188..dc64b37 100644
--- a/libproxy/modules/ignore_hostname.cpp
+++ b/libproxy/modules/ignore_hostname.cpp
@@ -33,4 +33,4 @@ public:
 	}
 };
 
-MM_MODULE_EZ(hostname_ignore_extension, true, NULL);
+MM_MODULE_EZ(hostname_ignore_extension, true, NULL, NULL);
diff --git a/libproxy/modules/ignore_ip.cpp b/libproxy/modules/ignore_ip.cpp
index 400cd64..92af38d 100644
--- a/libproxy/modules/ignore_ip.cpp
+++ b/libproxy/modules/ignore_ip.cpp
@@ -174,4 +174,4 @@ public:
 	}
 };
 
-MM_MODULE_EZ(ip_ignore_extension, true, NULL);
+MM_MODULE_EZ(ip_ignore_extension, true, NULL, NULL);
diff --git a/libproxy/modules/network_networkmanager.cpp b/libproxy/modules/network_networkmanager.cpp
index b59da7f..d9ae43f 100644
--- a/libproxy/modules/network_networkmanager.cpp
+++ b/libproxy/modules/network_networkmanager.cpp
@@ -89,4 +89,4 @@ private:
 	DBusConnection *conn;
 };
 
-MM_MODULE_EZ(networkmanager_network_extension, true, NULL);
+MM_MODULE_EZ(networkmanager_network_extension, true, NULL, NULL);
diff --git a/libproxy/modules/pacrunner_mozjs.cpp b/libproxy/modules/pacrunner_mozjs.cpp
index c611b4b..90f6dc1 100644
--- a/libproxy/modules/pacrunner_mozjs.cpp
+++ b/libproxy/modules/pacrunner_mozjs.cpp
@@ -165,4 +165,4 @@ private:
 	JSObject  *jsglb;
 };
 
-PX_PACRUNNER_MODULE_EZ(mozjs, true, "JS_DefineFunction");
+PX_PACRUNNER_MODULE_EZ(mozjs, true, "JS_DefineFunction", "mozjs");
diff --git a/libproxy/modules/pacrunner_webkit.cpp b/libproxy/modules/pacrunner_webkit.cpp
index 85f74f9..61f1b66 100644
--- a/libproxy/modules/pacrunner_webkit.cpp
+++ b/libproxy/modules/pacrunner_webkit.cpp
@@ -160,4 +160,4 @@ private:
 	JSGlobalContextRef jsctx;
 };
 
-PX_PACRUNNER_MODULE_EZ(webkit, true, "JSObjectMakeFunctionWithCallback");
+PX_PACRUNNER_MODULE_EZ(webkit, true, "JSObjectMakeFunctionWithCallback", "webkit");
diff --git a/libproxy/modules/wpad_dns_alias.cpp b/libproxy/modules/wpad_dns_alias.cpp
index 475b13d..38273b4 100644
--- a/libproxy/modules/wpad_dns_alias.cpp
+++ b/libproxy/modules/wpad_dns_alias.cpp
@@ -44,4 +44,4 @@ private:
 	char* lastpac;
 };
 
-MM_MODULE_EZ(dns_alias_wpad_extension, true, NULL);
+MM_MODULE_EZ(dns_alias_wpad_extension, true, NULL, NULL);