Index: libs/std/process.c
--- libs/std/process.c.orig	2008-03-16 14:59:15 +0100
+++ libs/std/process.c	2008-05-30 13:23:36 +0200
@@ -23,7 +23,7 @@
 #	include <unistd.h>
 #	include <errno.h>
 #	ifndef NEKO_MAC
-#		include <wait.h>
+#		include <sys/wait.h>
 #	endif
 #endif
 
Index: src/tools/install.neko
--- src/tools/install.neko.orig	2008-03-16 14:59:25 +0100
+++ src/tools/install.neko	2008-05-30 13:26:33 +0200
@@ -39,24 +39,6 @@
 // LIBS DATAS
 
 libs = {
-	mod_neko => {
-		src => $array("mod_neko","cgi","../../vm/context","../../vm/stats"),
-		inc => "httpd.h",
-		incname => "Apache 1.3.x"
-	},
-	mod_neko2 => {
-		src => $array("mod_neko","cgi","../../vm/context","../../vm/stats"),
-		inc => $array("httpd.h","apr.h"),
-		incname => "Apache 2.2.x",
-		cflags => "-D_LARGEFILE64_SOURCE",
-	},
-	mysql => {
-		src => $array("mysql"),
-		inc => "mysql.h",
-		incname => "MySQL 4.+"
-		lib => "libmysqlclient.a",
-		lparams => "-lz -lssl"
-	},
 	regexp => {
 		src => $array("regexp"),
 		inc => "pcre.h",
@@ -69,24 +51,11 @@
 		incname => "LibZ",
 		lparams => "-lz",
 	},
-	sqlite => {
-		src => $array("sqlite"),
-		inc => "sqlite3.h",
-		incname => "Sqlite 3",
-		lparams => "-lsqlite3",
-	},
-	ui => {
-		src => $array("ui"),
-		inc => switch system { "Mac" => "Carbon.h" default => "gtk/gtk.h" },
-		incname => switch system { "Mac" => "Carbon" default => "GTK+2.0" },
-		cflags => switch system { "Mac" => "" default => "`pkg-config --cflags gtk+-2.0`" },
-		lparams => switch system { "Mac" => "-framework Carbon" default => "`pkg-config --libs gtk+-2.0` -lgthread-2.0" },
-	}
 }
 
 // PLATFORM
 
-cflags = "-O3 -fPIC";
+cflags = "-O2 -fPIC";
 cc = getenv("CC");
 if( cc == null ) cc = "gcc";
 linkcmd = switch system { "BSD" => "ld" default => cc };
@@ -112,37 +81,13 @@
 
 search_includes = function(ism2) {
 	return $array(
-		"/usr/include",
-		if( ism2 ) "/usr/local/apache2/include" else "/usr/local/apache/include",
-		if( ism2 ) "/usr/include/apache2" else "/usr/apache/include",
-		if( ism2 ) "/opt/local/apache2/include" else "/opt/local/include/apache",
-		if( ism2 ) "" else "/usr/include/apache-1.3",
-		"/usr/local/include/mysql",
-		"/usr/include/mysql",
-		"/usr/local/include",
-		"/usr/include/apr-1",
-		"/usr/include/apr-1.0",
-		"/usr/include/apr-0",
-		"/usr/include/gtk-2.0",
-		"/usr/local/include/apr-1",
-		"/usr/local/include/apr-1.0",
-		"/usr/local/include/apr-0",
-		"/opt/local/include",
-		"/opt/local/include/apr-1",
-		"/opt/local/include/apr-1.0",
-		"/opt/local/include/apr-0",
-		"/opt/local/include/mysql",
-		"/Developer/Headers/FlatCarbon",
+		"@l_prefix@/include"
 	);
 }
 
 libraries = $array(
 	"../../libs/include",
-	"/usr/lib",
-	"/usr/local/lib",
-	"/usr/local/lib/mysql",
-	"/opt/local/lib",
-	"/opt/local/lib/mysql",
+	"@l_prefix@/lib"
 );
 
 exec = function(cmd) {
Index: vm/alloc.c
--- vm/alloc.c.orig	2008-03-16 14:59:25 +0100
+++ vm/alloc.c	2008-05-30 13:23:36 +0200
@@ -168,9 +168,14 @@
 #	else
 	pthread_mutex_init(&p.lock,NULL);
 	pthread_mutex_lock(&p.lock);
+#if 0 && defined(GC_PTHREADS)
 	// force the use of a the GC method to capture created threads
 	// this function should be defined in gc/gc.h
 	if( GC_pthread_create((pthread_t*)handle,NULL,&ThreadMain,&p) != 0 ) {
+#else
+#undef pthread_create
+	if( pthread_create((pthread_t*)handle,NULL,&ThreadMain,&p) != 0 ) {
+#endif
 		pthread_mutex_destroy(&p.lock);
 		return 0;
 	}