From 9f06ed8efb4c898df96cbc484cac43bc3881fd4a Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Thu, 23 Sep 2010 22:40:28 +0000
Subject: [PATCH] revert xml2 header check, and improve lib and include
directory search for ios.
git-svn-id: http://root.cern.ch/svn/root/trunk@35693 27541ba8-7e3a-0410-8455-c3a389f83636
---
configure | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index bcdeb1e8509..233131c3536 100755
--- a/configure
+++ b/configure
@@ -391,7 +391,15 @@ check_library() {
libdirs="$*"
if test ! "x$iossdk" = "x" ; then
- libdirs="$iossdk/usr/lib"
+ sdklibs=""
+ for i in $libdirs; do
+ #if test $i = "/usr/lib"; then
+ sdklibs="$sdklibs ${iossdk}${i}"
+ #else
+ # sdklibs="$sdklibs $i"
+ #fi
+ done
+ libdirs="$sdklibs"
fi
# Write a message
@@ -590,7 +598,15 @@ check_header() {
hdrdirs="$*"
if test ! "x$iossdk" = "x" ; then
- hdrdirs="$iossdk/usr/include"
+ sdkhdrs=""
+ for i in $hdrdirs; do
+ #if test $i = "/usr/include"; then
+ sdkhdrs="$sdkhdrs ${iossdk}${i}"
+ #else
+ # sdkhdrs="$sdkhdrs $i"
+ #fi
+ done
+ hdrdirs="$sdkhdrs"
fi
# Write a message
@@ -3766,8 +3782,8 @@ if test ! "x$enable_xml" = "xno" ; then
result "not found"
# fall back in case xml2-config is not found
keepincdir=$xmlincdir
- check_header "libxml2/libxml/tree.h" "$xmlincdir" $XMLDIR $XMLDIR/include \
- /opt/include $finkdir/include /usr/local/include
+ check_header "libxml/tree.h" "$xmlincdir" $XMLDIR $XMLDIR/include \
+ /opt/include/libxml2 /usr/local/include/libxml2 /usr/include/libxml2 $finkdir/include/libxml2
xmlincdir=$found_dir
keeplibdir=$xmllibdir
--
GitLab