remove builtin module support; there is a better way to do this

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

3 files changed, 267 insertions, 226 deletions

diff --git a/.cproject b/.cproject
index a148c25..0b606e8 100644
--- a/.cproject
+++ b/.cproject
@@ -244,6 +244,34 @@
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
+<target name="[lib] config_envvar" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>config_envvar</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] config_envvar/fast" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>config_envvar/fast</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] config_file" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>config_file</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] config_file/fast" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>config_file/fast</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
 <target name="[lib] config_gnome" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
@@ -286,6 +314,34 @@
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
+<target name="[lib] ignore_domain" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>ignore_domain</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] ignore_domain/fast" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>ignore_domain/fast</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] ignore_ip" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>ignore_ip</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] ignore_ip/fast" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>ignore_ip/fast</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
 <target name="[lib] libproxy" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
@@ -363,6 +419,20 @@
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
+<target name="[lib] wpad_dns_alias" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>wpad_dns_alias</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
+<target name="[lib] wpad_dns_alias/fast" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<buildCommand>/usr/bin/gmake</buildCommand>
+<buildArguments/>
+<buildTarget>wpad_dns_alias/fast</buildTarget>
+<stopOnError>true</stopOnError>
+<useDefaultCommand>false</useDefaultCommand>
+</target>
 <target name=": all" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
@@ -377,444 +447,444 @@
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] config_file.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] config_file.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>config_file.cpp.o</buildTarget>
+<buildTarget>config_file.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] config_file.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] config_file.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>config_file.cpp.i</buildTarget>
+<buildTarget>config_file.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] config_file.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] config_file.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>config_file.cpp.s</buildTarget>
+<buildTarget>config_file.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] dl_module.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] dl_module.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>dl_module.cpp.o</buildTarget>
+<buildTarget>dl_module.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] dl_module.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] dl_module.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>dl_module.cpp.i</buildTarget>
+<buildTarget>dl_module.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] dl_module.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] dl_module.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>dl_module.cpp.s</buildTarget>
+<buildTarget>dl_module.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] module.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] module.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module.cpp.o</buildTarget>
+<buildTarget>module.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] module.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] module.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module.cpp.i</buildTarget>
+<buildTarget>module.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] module.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] module.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module.cpp.s</buildTarget>
+<buildTarget>module.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] module_config.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] module_config.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_config.cpp.o</buildTarget>
+<buildTarget>module_config.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] module_config.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] module_config.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_config.cpp.i</buildTarget>
+<buildTarget>module_config.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] module_config.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] module_config.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_config.cpp.s</buildTarget>
+<buildTarget>module_config.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] module_manager.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] module_manager.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_manager.cpp.o</buildTarget>
+<buildTarget>module_manager.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] module_manager.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] module_manager.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_manager.cpp.i</buildTarget>
+<buildTarget>module_manager.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] module_manager.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] module_manager.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_manager.cpp.s</buildTarget>
+<buildTarget>module_manager.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] module_pacrunner.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] module_pacrunner.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_pacrunner.cpp.o</buildTarget>
+<buildTarget>module_pacrunner.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] module_pacrunner.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] module_pacrunner.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_pacrunner.cpp.i</buildTarget>
+<buildTarget>module_pacrunner.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] module_pacrunner.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] module_pacrunner.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_pacrunner.cpp.s</buildTarget>
+<buildTarget>module_pacrunner.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] module_wpad.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] module_wpad.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_wpad.cpp.o</buildTarget>
+<buildTarget>module_wpad.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] module_wpad.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] module_wpad.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_wpad.cpp.i</buildTarget>
+<buildTarget>module_wpad.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] module_wpad.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] module_wpad.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>module_wpad.cpp.s</buildTarget>
+<buildTarget>module_wpad.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/config_envvar.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/config_envvar.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_envvar.cpp.o</buildTarget>
+<buildTarget>modules/config_envvar.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/config_envvar.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/config_envvar.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_envvar.cpp.i</buildTarget>
+<buildTarget>modules/config_envvar.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/config_envvar.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/config_envvar.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_envvar.cpp.s</buildTarget>
+<buildTarget>modules/config_envvar.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/config_file.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/config_file.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_file.cpp.o</buildTarget>
+<buildTarget>modules/config_file.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/config_file.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/config_file.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_file.cpp.i</buildTarget>
+<buildTarget>modules/config_file.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/config_file.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/config_file.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_file.cpp.s</buildTarget>
+<buildTarget>modules/config_file.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/config_gnome.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/config_gnome.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_gnome.cpp.o</buildTarget>
+<buildTarget>modules/config_gnome.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/config_gnome.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/config_gnome.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_gnome.cpp.i</buildTarget>
+<buildTarget>modules/config_gnome.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/config_gnome.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/config_gnome.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_gnome.cpp.s</buildTarget>
+<buildTarget>modules/config_gnome.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/config_kde4.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/config_kde4.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_kde4.cpp.o</buildTarget>
+<buildTarget>modules/config_kde4.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/config_kde4.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/config_kde4.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_kde4.cpp.i</buildTarget>
+<buildTarget>modules/config_kde4.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/config_kde4.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/config_kde4.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_kde4.cpp.s</buildTarget>
+<buildTarget>modules/config_kde4.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/config_wpad.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/config_wpad.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_wpad.cpp.o</buildTarget>
+<buildTarget>modules/config_wpad.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/config_wpad.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/config_wpad.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_wpad.cpp.i</buildTarget>
+<buildTarget>modules/config_wpad.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/config_wpad.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/config_wpad.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/config_wpad.cpp.s</buildTarget>
+<buildTarget>modules/config_wpad.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/ignore_domain.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/ignore_domain.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_domain.cpp.o</buildTarget>
+<buildTarget>modules/ignore_domain.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/ignore_domain.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/ignore_domain.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_domain.cpp.i</buildTarget>
+<buildTarget>modules/ignore_domain.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/ignore_domain.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/ignore_domain.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_domain.cpp.s</buildTarget>
+<buildTarget>modules/ignore_domain.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/ignore_ip.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/ignore_ip.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_ip.cpp.o</buildTarget>
+<buildTarget>modules/ignore_ip.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/ignore_ip.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/ignore_ip.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_ip.cpp.i</buildTarget>
+<buildTarget>modules/ignore_ip.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/ignore_ip.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/ignore_ip.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/ignore_ip.cpp.s</buildTarget>
+<buildTarget>modules/ignore_ip.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/network_networkmanager.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/network_networkmanager.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/network_networkmanager.cpp.o</buildTarget>
+<buildTarget>modules/network_networkmanager.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/network_networkmanager.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/network_networkmanager.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/network_networkmanager.cpp.i</buildTarget>
+<buildTarget>modules/network_networkmanager.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/network_networkmanager.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/network_networkmanager.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/network_networkmanager.cpp.s</buildTarget>
+<buildTarget>modules/network_networkmanager.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/pacrunner_mozjs.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/pacrunner_mozjs.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_mozjs.cpp.o</buildTarget>
+<buildTarget>modules/pacrunner_mozjs.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/pacrunner_mozjs.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/pacrunner_mozjs.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_mozjs.cpp.i</buildTarget>
+<buildTarget>modules/pacrunner_mozjs.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/pacrunner_mozjs.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/pacrunner_mozjs.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_mozjs.cpp.s</buildTarget>
+<buildTarget>modules/pacrunner_mozjs.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/pacrunner_webkit.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/pacrunner_webkit.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_webkit.cpp.o</buildTarget>
+<buildTarget>modules/pacrunner_webkit.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/pacrunner_webkit.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/pacrunner_webkit.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_webkit.cpp.i</buildTarget>
+<buildTarget>modules/pacrunner_webkit.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/pacrunner_webkit.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/pacrunner_webkit.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pacrunner_webkit.cpp.s</buildTarget>
+<buildTarget>modules/pacrunner_webkit.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/pxgconf.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/pxgconf.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pxgconf.cpp.o</buildTarget>
+<buildTarget>modules/pxgconf.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/pxgconf.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/pxgconf.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pxgconf.cpp.i</buildTarget>
+<buildTarget>modules/pxgconf.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/pxgconf.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/pxgconf.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/pxgconf.cpp.s</buildTarget>
+<buildTarget>modules/pxgconf.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] modules/wpad_dns_alias.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] modules/wpad_dns_alias.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/wpad_dns_alias.cpp.o</buildTarget>
+<buildTarget>modules/wpad_dns_alias.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] modules/wpad_dns_alias.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] modules/wpad_dns_alias.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/wpad_dns_alias.cpp.i</buildTarget>
+<buildTarget>modules/wpad_dns_alias.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] modules/wpad_dns_alias.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] modules/wpad_dns_alias.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>modules/wpad_dns_alias.cpp.s</buildTarget>
+<buildTarget>modules/wpad_dns_alias.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] proxy.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] proxy.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>proxy.cpp.o</buildTarget>
+<buildTarget>proxy.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] proxy.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] proxy.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>proxy.cpp.i</buildTarget>
+<buildTarget>proxy.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] proxy.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] proxy.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>proxy.cpp.s</buildTarget>
+<buildTarget>proxy.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[obj] url.cpp.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[obj] url.o" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>url.cpp.o</buildTarget>
+<buildTarget>url.o</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[pre] url.cpp.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[pre] url.i" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>url.cpp.i</buildTarget>
+<buildTarget>url.i</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
-<target name="[to asm] url.cpp.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
+<target name="[to asm] url.s" path="libproxy" targetID="org.eclipse.cdt.make.MakeTargetBuilder">
 <buildCommand>/usr/bin/gmake</buildCommand>
 <buildArguments/>
-<buildTarget>url.cpp.s</buildTarget>
+<buildTarget>url.s</buildTarget>
 <stopOnError>true</stopOnError>
 <useDefaultCommand>false</useDefaultCommand>
 </target>
diff --git a/libproxy/CMakeLists.txt b/libproxy/CMakeLists.txt
index ecca9dc..6c32e35 100644
--- a/libproxy/CMakeLists.txt
+++ b/libproxy/CMakeLists.txt
@@ -1,50 +1,41 @@
-### Misc files
-# PkgConfig file
-configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY)
-install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig)
+### Main library
+add_library(libproxy SHARED config_file.cpp dl_module.cpp module_config.cpp module.cpp module_manager.cpp module_pacrunner.cpp module_wpad.cpp proxy.cpp url.cpp)
+if(WIN32)
+  target_link_libraries(libproxy ws2_32)
+else()
+  target_link_libraries(libproxy m pthread dl)
+endif()
+set_property(SOURCE proxy.cpp PROPERTY COMPILE_DEFINITIONS SYSCONFDIR="/etc/";MODULEDIR="${moduledir}")
+set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 0 SOVERSION 0.0.0)
+install(TARGETS libproxy DESTINATION ${rlibdir})
+install(FILES   proxy.h  DESTINATION ${rincludedir})
 
 ### Modules
-function(px_module name condition)
-  if(${condition} GREATER 0)
-    if(${condition} GREATER 1)
-      message("\t+\t${name}")
-      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS SYSCONFDIR="/etc/";LIBEXECDIR="${libexecdir}";BUILTIN=1)
-      set(BUILTIN_MODULES_SOURCES ${BUILTIN_MODULES_SOURCES};modules/${name}.cpp PARENT_SCOPE)
-      set(BUILTIN_MODULES "${BUILTIN_MODULES} \"${name}\"," PARENT_SCOPE)
-      if(${ARGC} GREATER 2)
-        set(BUILTIN_MODULES_LIBRARIES ${BUILTIN_MODULES_LIBRARIES};${ARGN} PARENT_SCOPE)
-      endif()
-    else()
-      message("\tm\t${name}")
-      add_library(${name} MODULE modules/${name}.cpp)
-      set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS SYSCONFDIR="/etc/";LIBEXECDIR="${libexecdir}")
-      target_link_libraries(${name} libproxy)
-      set_target_properties(${name} PROPERTIES PREFIX "")
-      install(TARGETS ${name} LIBRARY DESTINATION ${rmoduledir})
-      if(${ARGC} GREATER 2)
-        target_link_libraries(${name} ${ARGN})
-      endif()
+function(px_module name build)
+  if("${build}")
+    set(built "*")
+    set_property(SOURCE modules/${name}.cpp PROPERTY COMPILE_DEFINITIONS SYSCONFDIR="/etc/";LIBEXECDIR="${libexecdir}")
+    add_library(${name} MODULE modules/${name}.cpp)
+    target_link_libraries(${name} libproxy)
+    set_target_properties(${name} PROPERTIES PREFIX "")
+    install(TARGETS ${name} LIBRARY DESTINATION ${rmoduledir})
+    if(${ARGC} GREATER 2)
+      target_link_libraries(${name} ${ARGN})
     endif()
-  else()
-    message("\t\t${name}")
   endif()
+  message("\t${built}\t${name}")
 endfunction(px_module)
 
-function(px_module_condmod name loadcond condition)
-  px_module(${name} ${condition} ${ARGN})
-  if(${condition} EQUAL 1)
-    set(CONDITIONAL_MODULES "${CONDITIONAL_MODULES} {\"${loadcond}\", \"${name}\"}," PARENT_SCOPE)
-  endif()
-endfunction(px_module_condmod)
-
 #
 ## Dependency detection
 #
-if(UNIX AND NOT APPLE)
-  find_package(PkgConfig REQUIRED)
+
+find_package(PkgConfig)
+if("${PKG_CONFIG_FOUND}")
+  # Define our magical px_check_modules function
   function(px_check_modules name)
     pkg_check_modules(${name} ${ARGN})
-    if (${${name}_FOUND})
+    if(${${name}_FOUND})
       include_directories(${${name}_INCLUDE_DIRS})
       link_directories(${${name}_LIBRARY_DIRS})
     else()
@@ -56,16 +47,16 @@ if(UNIX AND NOT APPLE)
   px_check_modules(NM          NetworkManager dbus-1)
   px_check_modules(WEBKIT      webkit-1.0)
   px_check_modules(MOZJS       xulrunner-js)
-  if(NOT MOZJS_FOUND)
+  if(NOT ${MOZJS_FOUND})
     px_check_modules(MOZJS     firefox-js)
-    if(NOT MOZJS_FOUND)
+    if(NOT ${MOZJS_FOUND})
       px_check_modules(MOZJS   mozilla-js)
-      if(NOT MOZJS_FOUND)
+      if(NOT ${MOZJS_FOUND})
         px_check_modules(MOZJS seamonkey-js)
       endif()
     endif()
   endif()
-  if(X11_FOUND)
+  if("${X11_FOUND}")
     px_check_modules(GNOME     gconf-2.0)
     find_package(KDE4)
     if("${KDE4_FOUND}" STREQUAL "TRUE")
@@ -78,50 +69,52 @@ if(UNIX AND NOT APPLE)
       set(KDE4_FOUND 0)
     endif()
   endif()
-  find_program(GCONFTOOLBIN gconftool-2)
 endif()
 
-#
-## Module definition
-#
-message("MODULES TO BUILD:")
-if(UNIX AND NOT APPLE)
-  px_module(config_wpad              1)
-  px_module(config_envvar            2)
-  px_module(config_file              2)
-  px_module(config_gnome             ${GNOME_FOUND}  ${X11_LIBRARIES})
-  px_module(config_kde4              ${KDE4_FOUND}   ${KDE4_LIBRARIES} ${X11_LIBRARIES})
-  px_module(network_networkmanager   ${NM_FOUND}     ${NM_LIBRARIES})
-  px_module_condmod(pacrunner_mozjs  JS_DefineFunction                ${MOZJS_FOUND}  ${MOZJS_LIBRARIES})
-  px_module_condmod(pacrunner_webkit JSObjectMakeFunctionWithCallback ${WEBKIT_FOUND} ${WEBKIT_LIBRARIES})
-  if(${GNOME_FOUND})
-    add_executable(pxgconf modules/pxgconf.cpp)
-    target_link_libraries(pxgconf ${GNOME_LIBRARIES})
-    install(TARGETS pxgconf RUNTIME DESTINATION ${rlibexecdir})
-  endif()
-elseif(APPLE)
+if(APPLE)
   find_library(WEBKIT_LIBRARIES JavaScriptCore)
   find_library(SC_LIBRARIES SystemConfiguration)
   find_library(CF_LIBRARIES CoreFoundation)
-  px_module(pacrunner_webkit       2 ${WEBKIT_LIBRARIES})
-  px_module(config_macosx          2 ${SC_LIBRARIES} ${CF_LIBRARIES})
-  px_module(ignore_hostname        2)
-elseif(WIN32)
-  px_module(config_w32reg          2)
+  if(${WEBKIT_LIBRARIES})
+    set(WEBKIT_FOUND 1)
+  endif()
+  if(${SC_LIBRARIES})
+    set(SC_FOUND 1)
+  endif()
+  if(${CF_LIBRARIES})
+    set(CF_FOUND 1)
+  endif()
 endif()
-px_module(ignore_domain            2)
-px_module(ignore_ip                2)
-px_module(wpad_dns_alias           2)
+
+
+#
+## Module definition
+#
+message("MODULES TO BUILD:")
+px_module(config_envvar            "${UNIX}")
+px_module(config_file              "${UNIX}")
+px_module(config_gnome             "${GNOME_FOUND}"  ${X11_LIBRARIES})
+px_module(config_kde4              "${KDE4_FOUND}"   ${KDE4_LIBRARIES} ${X11_LIBRARIES})
+px_module(config_macosx            "${SC_FOUND}"     ${SC_LIBRARIES} ${CF_LIBRARIES})
+px_module(config_w32reg            "${WIN32}")
+px_module(config_wpad              1)
+px_module(ignore_domain            1)
+px_module(ignore_hostname          "${APPLE}")
+px_module(ignore_ip                1)
+px_module(network_networkmanager   "${NM_FOUND}"     ${NM_LIBRARIES})
+px_module(pacrunner_mozjs          "${MOZJS_FOUND}"  ${MOZJS_LIBRARIES})
+px_module(pacrunner_webkit         "${WEBKIT_FOUND}" ${WEBKIT_LIBRARIES})
+px_module(wpad_dns_alias           1)
 message("")
 
-### Main library
-add_library(libproxy SHARED config_file.cpp dl_module.cpp module_config.cpp module.cpp module_manager.cpp module_pacrunner.cpp module_wpad.cpp proxy.cpp url.cpp ${BUILTIN_MODULES_SOURCES})
-if (WIN32)
-  target_link_libraries(libproxy ws2_32 ${BUILTIN_MODULES_LIBRARIES})
-else()
-  target_link_libraries(libproxy m pthread dl ${BUILTIN_MODULES_LIBRARIES})
+### Misc files
+# PkgConfig file
+configure_file(libproxy-1.0.pc.in libproxy-1.0.pc @ONLY)
+install(FILES libproxy-1.0.pc DESTINATION ${libdir}/pkgconfig)
+
+# GNOME (gconf) helper
+if(${GNOME_FOUND})
+  add_executable(pxgconf modules/pxgconf.cpp)
+  target_link_libraries(pxgconf ${GNOME_LIBRARIES})
+  install(TARGETS pxgconf RUNTIME DESTINATION ${rlibexecdir})
 endif()
-set_property(SOURCE proxy.cpp PROPERTY COMPILE_DEFINITIONS SYSCONFDIR="/etc/";MODULEDIR="${moduledir}";BUILTIN_MODULES=${BUILTIN_MODULES};CONDITIONAL_MODULES=${CONDITIONAL_MODULES})
-set_target_properties(libproxy PROPERTIES PREFIX "" VERSION 0 SOVERSION 0.0.0)
-install(TARGETS libproxy DESTINATION ${rlibdir})
-install(FILES   proxy.h  DESTINATION ${rincludedir})
diff --git a/libproxy/proxy.cpp b/libproxy/proxy.cpp
index c2e1d35..cd0fbac 100644
--- a/libproxy/proxy.cpp
+++ b/libproxy/proxy.cpp
@@ -37,19 +37,6 @@ namespace googlecode {
 namespace libproxy {
 using namespace std;
 
-static const char* _builtin_modules[] = {
-                BUILTIN_MODULES
-                NULL
-};
-
-static struct {
-	const char* condition;
-	const char* modname;
-} _conditional_modules[] = {
-        CONDITIONAL_MODULES
-        {NULL, NULL}
-};
-
 class proxy_factory {
 public:
 	proxy_factory();
@@ -132,15 +119,6 @@ proxy_factory::proxy_factory() {
 			setenv("_PX_CONFIG_ORDER", tmp.c_str(), 1);
 	}
 
-	// Load all builtin modules
-	for (int i=0 ; _builtin_modules[i] ; i++)
-		this->mm.load_builtin(_builtin_modules[i]);
-
-	// Load conditional modules
-	for (int i=0 ; _conditional_modules[i].modname ; i++)
-		this->mm.load_file(string(MODULEDIR) + _conditional_modules[i].modname + "." + MODULEEXT,
-							_conditional_modules[i].condition);
-
 	// Load all modules
 	this->mm.load_dir(MODULEDIR);