--- ./src/configure.orig	Sun Mar  6 09:10:36 2005
+++ ./src/configure	Fri Jun 16 21:53:31 2006
@@ -227,7 +227,7 @@
 ####
 check_lib() {
 	LIBNAME=$1
-	LIB=`$COMP_EXE -print-file-name=$2 | grep "/"`
+	LIB=`$COMP_EXE -print-file-name=$2`
 	if test $LIB
 	then
 		echo "Checking for: $LIBNAME		found"
@@ -328,15 +328,10 @@
 	then
 		echo "CCFLAGS = -D_WIN32_" >> Makefile
 	else
-		echo "CCFLAGS =" >> Makefile
+		echo "CCFLAGS = $CFLAGS `$SDLCONFIG --cflags`" >> Makefile
 	fi
 	if test $optimize = 1
 	then
-		ARCH=`uname -m`
-		if test $ARCH != "unknown"
-		then
-			echo "CCFLAGS += -march=$ARCH" >> Makefile
-		fi
 		echo "CCFLAGS += -O3 -fexpensive-optimizations" >> Makefile
 	fi
 	echo "" >> Makefile
@@ -525,7 +520,7 @@
 #THREADS_OBJS=`find . -maxdepth 1 -name '*.cpp' | sort | grep thread | sed -e 's/.cpp/.o \\\/'`
 EXC_OBJ=`find . -name '*.cpp' | sort | grep /Exception.cpp | sed -e 's/.cpp/.o \\\/'`
 THREAD_EXCP_OBJ=`find . -name '*.cpp' | sort | grep /ThreadException.cpp | sed -e 's/.cpp/.o \\\/'`
-OTHER_OBJS=`find . -name '*.cpp' | sort | sed '/\/ThreadException.cpp/d' | sed '/\/thread/d' | sed -e 's/.cpp/.o \\\/'`
+OTHER_OBJS=`find . -name '*.cpp' | sort | sed '/\/ThreadException.cpp/d' | sed '/\/thread/d' | grep -Ev 'nil_main_(client|server)' | sed -e 's/.cpp/.o \\\/'`
 
 ####
 # Main script