From 8fa7645e051733d74edaf0dd06871f9d731bd2c7 Mon Sep 17 00:00:00 2001
From: James David Berry <jberry@apache.org>
Date: Tue, 20 Oct 2009 03:40:45 +0000
Subject: [PATCH] Look for curl and icu first in , if it's specified, before
 looking in /usr/local and /usr, and after looking in the location specified
 in the --with-curl argument. Partial fix to #XERCESC-1892

git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@826941 13f79535-47bb-0310-9956-ffa450edef68
---
 m4/xerces_curl_prefix.m4 | 8 ++++++--
 m4/xerces_icu_prefix.m4  | 8 ++++++--
 reconf                   | 2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4
index 2102eae96..91be4a2fd 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 e17bc43af..6b809ca53 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 3b38a7ec9..290b0654b 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
-- 
GitLab