diff -Naur php-5.2.8/TSRM/build.mk php/TSRM/build.mk
--- php-5.2.8/TSRM/build.mk	1999-10-09 19:01:20.000000000 -0700
+++ php/TSRM/build.mk	2009-01-03 20:35:18.000000000 -0800
@@ -25,7 +25,7 @@
 
 $(LT_TARGETS):
 	rm -f $(LT_TARGETS)
-	libtoolize --automake $(AMFLAGS) -f
+	glibtoolize --automake $(AMFLAGS) -f
 
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)
diff -Naur php-5.2.8/TSRM/buildconf php/TSRM/buildconf
--- php-5.2.8/TSRM/buildconf	1999-10-05 06:47:16.000000000 -0700
+++ php/TSRM/buildconf	2009-01-03 20:35:18.000000000 -0800
@@ -7,7 +7,7 @@
 ;;
 esac
 
-libtoolize --force --automake $automake_flags
+glibtoolize --force --automake $automake_flags
 
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal
diff -Naur php-5.2.8/Zend/build.mk php/Zend/build.mk
--- php-5.2.8/Zend/build.mk	1999-10-09 19:02:13.000000000 -0700
+++ php/Zend/build.mk	2009-01-03 20:35:18.000000000 -0800
@@ -25,7 +25,7 @@
 
 $(LT_TARGETS):
 	rm -f $(LT_TARGETS)
-	libtoolize --automake $(AMFLAGS) -f
+	glibtoolize --automake $(AMFLAGS) -f
 
 $(makefile_in_files): $(makefile_am_files)
 	automake -a -i $(AMFLAGS) $(makefile_files)
diff -Naur php-5.2.8/Zend/buildconf php/Zend/buildconf
--- php-5.2.8/Zend/buildconf	1999-10-04 08:20:12.000000000 -0700
+++ php/Zend/buildconf	2009-01-03 20:35:18.000000000 -0800
@@ -7,7 +7,7 @@
 ;;
 esac
 
-libtoolize --force --automake $automake_flags
+glibtoolize --force --automake $automake_flags
 
 mv aclocal.m4 aclocal.m4.old 2>/dev/null
 aclocal
diff -Naur php-5.2.8/ext/mbstring/libmbfl/buildconf php/ext/mbstring/libmbfl/buildconf
--- php-5.2.8/ext/mbstring/libmbfl/buildconf	2003-08-22 23:18:35.000000000 -0700
+++ php/ext/mbstring/libmbfl/buildconf	2009-01-03 20:35:18.000000000 -0800
@@ -1,5 +1,5 @@
 #!/bin/sh
-libtoolize -c -f --automake
+glibtoolize -c -f --automake
 aclocal
 autoheader
 automake -a -c --foreign
diff -Naur php-5.2.8/ext/mbstring/libmbfl/config.h php/ext/mbstring/libmbfl/config.h
--- php-5.2.8/ext/mbstring/libmbfl/config.h	1969-12-31 16:00:00.000000000 -0800
+++ php/ext/mbstring/libmbfl/config.h	2009-01-03 20:35:19.000000000 -0800
@@ -0,0 +1 @@
+#include "php_config.h"