--- a/config.lib	Wed May 09 20:22:49 2007 +0000
+++ b/config.lib	Thu May 10 15:07:16 2007 +0000
@@ -59,8 +59,9 @@
 	with_freetype="1"
 	with_fontconfig="1"
 	with_psp_config="1"
+	with_threads="1"
 
-	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config CC CXX CFLAGS LDFLAGS"
+	save_params_array="build host cc_build cc_host cxx_build cxx_host windres strip awk lipo os cpu_type revision endian config_log prefix_dir binary_dir data_dir icon_dir personal_dir install_dir custom_lang_dir second_data_dir enable_install enable_debug enable_profiling enable_dedicated enable_network enable_static enable_translator enable_assert enable_strip with_osx_sysroot enable_universal enable_osx_g5 enable_unicode with_application_bundle with_sdl with_cocoa with_zlib with_png with_makedepend with_direct_music with_sort with_iconv with_midi with_midi_arg with_libtimidity with_freetype with_fontconfig with_psp_config with_threads CC CXX CFLAGS LDFLAGS"
 }
 
 detect_params() {
@@ -245,6 +246,10 @@
 			--with-application-bundle)    with_application_bundle="1";;
 			--with-application-bundle=*)  with_application_bundle="$optarg";;
 
+			--without-threads)            with_threads="0";;
+			--with-threads)               with_threads="1";;
+			--with-threads=*)             with_threads="$optarg";;
+
 			CC=* | --CC=*)                CC="$optarg";;
 			CXX=* | --CXX=*)              CXX="$optarg";;
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
@@ -675,6 +680,10 @@
 		LDFLAGS="$LDFLAGS -pg"
 	fi
 
+	if [ "$with_threads" == "0" ]; then
+		CFLAGS="$CFLAGS -DNO_THREADS"
+	fi
+
 	# Enable some things only for certain GCC versions
 	cc_version=`$cc_host -dumpversion | cut -c 1,3`