From 76e18260dda2af3d35603b808db0c8824d9abd85 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 7 May 2022 17:50:56 +0300
Subject: [PATCH] Fix detection of dynamic libraries with MinGW
Cherry-picked from SDL_image (https://github.com/libsdl-org/SDL_image/pull/192)
Original patch authored by Cameron Cawley (@ccawley2011)
---
configure | 5 ++++-
configure.ac | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 4205803b..f5cf80fc 100755
--- a/configure
+++ b/configure
@@ -15172,6 +15172,8 @@ case "$host" in
# Look for the location of the tools and install there
if test "$BUILD_PREFIX" != ""; then
ac_default_prefix=$BUILD_PREFIX
+ elif test "$MINGW_PREFIX" != ""; then
+ ac_default_prefix=$MINGW_PREFIX
fi
fi
;;
@@ -15186,6 +15188,7 @@ esac
# Standard C sources
SOURCES=`ls $srcdir/src/*.c $srcdir/src/codecs/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
+base_bindir=`echo \${bindir} | sed 's/.*\/\(.*\)/\1/; q'`
base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
CheckWarnAll()
@@ -15286,7 +15289,7 @@ find_lib()
if test "$cross_compiling" = yes; then
host_lib_path=""
else
- host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
+ host_lib_path="$ac_default_prefix/$base_libdir $ac_default_prefix/$base_bindir /usr/$base_libdir /usr/local/$base_libdir"
fi
for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do
lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`
diff --git a/configure.ac b/configure.ac
index a8cc70fa..d4223abf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,8 @@ case "$host" in
# Look for the location of the tools and install there
if test "$BUILD_PREFIX" != ""; then
ac_default_prefix=$BUILD_PREFIX
+ elif test "$MINGW_PREFIX" != ""; then
+ ac_default_prefix=$MINGW_PREFIX
fi
fi
;;
@@ -167,6 +169,7 @@ esac
SOURCES=`ls $srcdir/src/*.c $srcdir/src/codecs/*.c | fgrep -v playwave.c | fgrep -v playmus.c`
dnl set this to use on systems that use lib64 instead of lib
+base_bindir=`echo \${bindir} | sed 's/.*\/\(.*\)/\1/; q'`
base_libdir=`echo \${libdir} | sed 's/.*\/\(.*\)/\1/; q'`
dnl See if GCC's -Wall is supported.
@@ -236,7 +239,7 @@ find_lib()
if test "$cross_compiling" = yes; then
host_lib_path=""
else
- host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
+ host_lib_path="$ac_default_prefix/$base_libdir $ac_default_prefix/$base_bindir /usr/$base_libdir /usr/local/$base_libdir"
fi
for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do
lib=[`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`]