Author: jberry
Date: Tue Oct 20 03:40:45 2009
New Revision: 826941
URL: http://svn.apache.org/viewvc?rev=826941&view=rev
Log:
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
Modified:
xerces/c/trunk/m4/xerces_curl_prefix.m4
xerces/c/trunk/m4/xerces_icu_prefix.m4
xerces/c/trunk/reconf
Modified: xerces/c/trunk/m4/xerces_curl_prefix.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_curl_prefix.m4?rev=826941&r1=826940&r2=826941&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_curl_prefix.m4 (original)
+++ xerces/c/trunk/m4/xerces_curl_prefix.m4 Tue Oct 20 03:40:45 2009
@@ -21,9 +21,13 @@
[
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
Modified: xerces/c/trunk/m4/xerces_icu_prefix.m4
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/m4/xerces_icu_prefix.m4?rev=826941&r1=826940&r2=826941&view=diff
==============================================================================
--- xerces/c/trunk/m4/xerces_icu_prefix.m4 (original)
+++ xerces/c/trunk/m4/xerces_icu_prefix.m4 Tue Oct 20 03:40:45 2009
@@ -21,8 +21,12 @@
[
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
Modified: xerces/c/trunk/reconf
URL:
http://svn.apache.org/viewvc/xerces/c/trunk/reconf?rev=826941&r1=826940&r2=826941&view=diff
==============================================================================
--- xerces/c/trunk/reconf (original)
+++ xerces/c/trunk/reconf Tue Oct 20 03:40:45 2009
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
