--- configure.orig	Sun Jan  7 10:39:57 2007
+++ configure	Sat Jan 27 19:23:03 2007
@@ -20313,7 +20313,7 @@
 
 
 # This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+LIBTOOL_DEPS="--disable-ltlibs /usr/local/share/libtool15/ltmain.sh"
 
 # Always use our own libtool.
 LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -25997,7 +25997,7 @@
 		else
 			{ echo "$as_me:$LINENO: result: no..using lpthread" >&5
 echo "${ECHO_T}no..using lpthread" >&6; }
-			SS_THREAD_LIBLINK="-lpthread"
+			SS_THREAD_LIBLINK="-pthread"
 
 cat >>confdefs.h <<\_ACEOF
 #define COMPILE_THREADS_USE_POSIX 1
@@ -27491,7 +27491,7 @@
 			# Set the X include and lib dir
 	 		SS_X_INCDIR="$x_includes"
 			SS_X_LIBDIR="$x_libraries"
-			SS_X_LIBLINK="-lX11 -lXext"
+			SS_X_LIBLINK="-lX11 -lXext -pthread"
 
 			if test -z "$SS_X_INCDIR"; then
 				# Ops... X headers not found ?
@@ -30709,7 +30709,7 @@
 		fi
 	done
 
-	SS_DIRTAG=`echo $VERSION | cut -d . -f 1,2`
+	SS_DIRTAG=`echo $VERSION | cut -d . -f 1,2,3`
 
 
 cat >>confdefs.h <<_ACEOF