diff options
| author | glx <glx@openttd.org> | 2018-06-17 01:28:08 +0200 |
|---|---|---|
| committer | glx22 <glx22@users.noreply.github.com> | 2018-06-17 21:56:46 +0200 |
| commit | 10d8b83038413761fda96b022813ff788260287d (patch) | |
| tree | b5afc0e9e31015f22f8b9a8eb704aaa2f7a61741 /config.lib | |
| parent | ae467ffc8ac17a978241c4909301ffdacac54667 (diff) | |
| download | openttd-10d8b83038413761fda96b022813ff788260287d.tar.xz | |
Fix: library detection on MSYS2 file system
Diffstat (limited to 'config.lib')
| -rw-r--r-- | config.lib | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config.lib b/config.lib index 67ec69211..50cfa28d2 100644 --- a/config.lib +++ b/config.lib @@ -2667,6 +2667,11 @@ detect_library() { eval "res=\$$2" if [ -z "$res" ]; then log 2 " trying /mingw/include/$4$5... no" + eval "$2=`ls -1 /mingw$cpu_type/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" + fi + eval "res=\$$2" + if [ -z "$res" ]; then + log 2 " trying /mingw$cpu_type/include/$4$5... no" eval "$2=`ls -1 /opt/local/include/$4*.h 2>/dev/null | egrep \"\/$5\$\"`" fi eval "res=\$$2" @@ -2715,6 +2720,11 @@ detect_library() { eval "res=\$$2" if [ -z "$res" ]; then log 2 " trying /mingw/lib/$3... no" + eval "$2=`ls /mingw$cpu_type/lib/*.a 2>/dev/null | egrep \"\/$3\$\"`" + fi + eval "res=\$$2" + if [ -z "$res" ]; then + log 2 " trying /mingw$cpu_type/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" |