diff -ur thrift-20070401-backup/bootstrap.sh thrift-20070401/bootstrap.sh
--- thrift-20070401-backup/bootstrap.sh	2007-04-01 03:06:16.000000000 +0530
+++ thrift-20070401/bootstrap.sh	2007-06-07 14:02:41.000000000 +0530
@@ -5,10 +5,10 @@
 ./cleanup.sh
 echo "SUBDIRS = ${subdirs}" > Makefile.am
 
-aclocal
+aclocal-1.9
 touch NEWS README AUTHORS ChangeLog
-autoconf
-automake -ac
+autoconf-2.60
+automake-1.9 -ac
 
 for subdir in ${subdirs}; do 
     if [ -x "${subdir}/bootstrap.sh" ]; then 
diff -ur thrift-20070401-backup/compiler/cpp/bootstrap.sh thrift-20070401/compiler/cpp/bootstrap.sh
--- thrift-20070401-backup/compiler/cpp/bootstrap.sh	2007-01-25 13:28:55.000000000 +0530
+++ thrift-20070401/compiler/cpp/bootstrap.sh	2007-06-07 14:03:09.000000000 +0530
@@ -1,9 +1,9 @@
 #!/bin/sh
 
 ./cleanup.sh
-autoscan
-aclocal
+autoscan-2.60
+aclocal-1.9
 libtoolize --automake
 touch NEWS README AUTHORS ChangeLog
-autoconf
-automake -ac
+autoconf-2.60
+automake-1.9 -ac
diff -ur thrift-20070401-backup/lib/cpp/bootstrap.sh thrift-20070401/lib/cpp/bootstrap.sh
--- thrift-20070401-backup/lib/cpp/bootstrap.sh	2007-01-25 13:28:55.000000000 +0530
+++ thrift-20070401/lib/cpp/bootstrap.sh	2007-06-07 14:03:39.000000000 +0530
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 ./cleanup.sh
-autoscan
-autoheader
-aclocal -I ./aclocal
+autoscan-2.60
+autoheader-2.60
+aclocal-1.9 -I ./aclocal
 libtoolize --automake
 touch NEWS README AUTHORS ChangeLog
-autoconf
-automake -ac
+autoconf-2.60
+automake-1.9 -ac
diff -ur thrift-20070401-backup/lib/py/bootstrap.sh thrift-20070401/lib/py/bootstrap.sh
--- thrift-20070401-backup/lib/py/bootstrap.sh	2007-01-25 13:28:55.000000000 +0530
+++ thrift-20070401/lib/py/bootstrap.sh	2007-06-07 14:03:58.000000000 +0530
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 ./cleanup.sh
-aclocal
+aclocal-1.9
 touch NEWS README AUTHORS ChangeLog
-autoconf
-automake -ac
+autoconf-2.60
+automake-1.9 -ac
--- thrift-20070401-backup/lib/cpp/src/transport/TFileTransport.h	2007-03-28 04:47:34.000000000 +0530
+++ thrift-20070401/lib/cpp/src/transport/TFileTransport.h	2007-06-07 14:35:38.000000000 +0530
@@ -16,6 +16,8 @@
 
 #include <boost/shared_ptr.hpp>
 
+#include <compat/kernel_time.h>
+
 namespace facebook { namespace thrift { namespace transport { 
 
 using facebook::thrift::TProcessor;