summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2010-02-28 00:22:23 +0000
committerrubidium <rubidium@openttd.org>2010-02-28 00:22:23 +0000
commita19e6ff9747f9310c4b39ed3496b0a994674d263 (patch)
tree526a01cd83a8c591181b77ef2ce64f7aa3a8b5db
parent3926b6244652a039ff5eebc4119c7b6beb434ec1 (diff)
downloadopenttd-a19e6ff9747f9310c4b39ed3496b0a994674d263.tar.xz
(svn r19285) -Change [FS#3638]: add the default installation directory of lzo/zlib for Mac OS X/MinGW to the paths where (the headers of) those libraries are searched
-rw-r--r--config.lib15
1 files changed, 15 insertions, 0 deletions
diff --git a/config.lib b/config.lib
index bd72f6aca..2d84ca465 100644
--- a/config.lib
+++ b/config.lib
@@ -2303,6 +2303,16 @@ detect_library() {
eval "res=\$$2"
if [ -z "$res" ]; then
log 2 " trying /usr/local/include/$4$5... no"
+ eval "$2=`ls -1 /mingw/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+ fi
+ eval "res=\$$2"
+ if [ -z "$res" ]; then
+ log 2 " trying /usr/local/include/$4$5... no"
+ eval "$2=`ls -1 /opt/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`"
+ fi
+ eval "res=\$$2"
+ if [ -z "$res" ]; then
+ log 2 " trying /opt/local/include/$4$5... no"
fi
eval "res=\$$2"
@@ -2324,6 +2334,11 @@ detect_library() {
eval "res=\$$2"
if [ -z "$res" ]; then
log 2 " trying /usr/local/lib/$3... no"
+ eval "$2=`ls /mingw/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`"
+ fi
+ eval "res=\$$2"
+ if [ -z "$res" ]; then
+ log 2 " trying /mingw/lib/$3... no"
log 1 "configure: error: $2 couldn't be found"
log 1 "configure: error: you requested a static link, but I can't find $3"