diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4
index 2102eae96fdfb2c347c4b45b2f7ec6a8c0dde3a5..91be4a2fd1eae4811158b67aaf243281b5058fe3 100644
--- a/m4/xerces_curl_prefix.m4
+++ b/m4/xerces_curl_prefix.m4
@@ -21,9 +21,13 @@ AC_DEFUN([XERCES_CURL_PREFIX],
 	[	
 		xerces_cv_curl_prefix=
 		if test x"$with_curl" != x"no"; then
-			search_list="$with_curl /usr/local /usr"
+			pfix=$prefix
+			if test x"$pfix" == x"NONE"; then
+				pfix=
+			fi
+			search_list="$with_curl $pfix /usr/local /usr"
 			for i in $search_list; do
-				if test -r "$i/include/curl/easy.h" -a -r "$i/include/curl/multi.h" ; then
+				if test -r "$i/include/curl/easy.h" -a -r "$i/include/curl/multi.h" -a -x "$i/bin/curl-config" ; then
 					xerces_cv_curl_prefix=$i
 					break
 				fi
diff --git a/m4/xerces_icu_prefix.m4 b/m4/xerces_icu_prefix.m4
index e17bc43affdeda0fcdc18a2e1f6e8eda15af5c05..6b809ca53b005a056eaa308a1ab55e6cbfba0db7 100644
--- a/m4/xerces_icu_prefix.m4
+++ b/m4/xerces_icu_prefix.m4
@@ -21,8 +21,12 @@ AC_DEFUN([XERCES_ICU_PREFIX],
 	[	
 		xerces_cv_icu_prefix=
 		if test x"$with_icu" != x"no"; then
-			search_list="$with_icu /usr/local /usr"
-			for i in $search_list; do			
+			pfix=$prefix
+			if test x"$pfix" == x"NONE"; then
+				pfix=
+			fi
+			search_list="$with_icu $pfix /usr/local /usr"
+			for i in $search_list; do	
 				if test -r $i/include/unicode/ucnv.h; then
 					xerces_cv_icu_prefix=$i
 					break
diff --git a/reconf b/reconf
index 3b38a7ec952d5c95bd04136995afd47d7ce9f22c..290b0654bba4c15e9a87fd8a487c9145377ad3cd 100755
--- a/reconf
+++ b/reconf
@@ -1,7 +1,7 @@
 #!/bin/sh
 set -x
 rm -f config.cache
-libtoolize --copy --force
+glibtoolize --copy --force
 aclocal -I m4
 autoheader
 automake -a -c -f