Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDick Porter <dick@acm.org>2003-02-06 16:46:21 +0300
committerDick Porter <dick@acm.org>2003-02-06 16:46:21 +0300
commit40fd4c2e1b4cc7e5f5bd617e1fec535af561b539 (patch)
treea080b959f905abb5ca1e3d1abac71824e4b695d2 /web/mono-build.sh
parent304a621cd557246c6c1496d763c65d240b97ece6 (diff)
Only look for iconv headers in well-defined locations
svn path=/trunk/mono/; revision=11279
Diffstat (limited to 'web/mono-build.sh')
-rwxr-xr-xweb/mono-build.sh16
1 files changed, 14 insertions, 2 deletions
diff --git a/web/mono-build.sh b/web/mono-build.sh
index 2cfaf6d6ff0..75abacef06d 100755
--- a/web/mono-build.sh
+++ b/web/mono-build.sh
@@ -155,8 +155,20 @@ export PKG_CONFIG_PATH
# /usr/local/include and /usr/local/lib to CPPFLAGS and LDFLAGS. We could
# skip this if it would add /usr/include and /usr/lib, but leaving it
# shouldnt break anything.
-iconvh=`locate include/iconv.h`
-iconvh_dir=`dirname $iconvh`
+iconvdirs="/usr/include /usr/local/include"
+for i in $iconvdirs
+do
+ if [ -f $i/iconv.h ]; then
+ iconvh_dir=$i
+ break
+ fi
+done
+
+if [ -z "$iconvh_dir" ]; then
+ echo "Can't find iconv headers (looked in $iconvdirs)"
+ exit -1
+fi
+
iconvlib_dir=`echo $iconvh_dir | sed -e 's/include/lib/'`
echo "Adding $iconvh_dir to CPPFLAGS"