[Scummvm-git-logs] scummvm master -> 15d282a34b9c47c3c4c1462c2ed45094fa80a8b1

[orgads]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
15d282a34b CONFIGURE: Do not pass --prefix to sdl2-config


Commit: 15d282a34b9c47c3c4c1462c2ed45094fa80a8b1
    https://github.com/scummvm/scummvm/commit/15d282a34b9c47c3c4c1462c2ed45094fa80a8b1
Author: Orgad Shaneh (orgads at gmail.com)
Date: 2021-08-01T18:06:24+03:00

Commit Message:
CONFIGURE: Do not pass --prefix to sdl2-config

Reapply a6ded8907570bb4b14101d67f076968f0775f460.

This already works with all the platforms on buildbot. The mingw release
environment had a misconfigured sdl2-config, but this should now be
fixed.

Changed paths:
    configure


diff --git a/configure b/configure
index 8a3ff9055a..b6e96371da 100755
--- a/configure
+++ b/configure
@@ -462,11 +462,6 @@ find_sdlconfig() {
 			if test -f "$path_dir/$sdlconfig" ; then
 				_sdlconfig="$path_dir/$sdlconfig"
 				echo $_sdlconfig
-				# Save the prefix
-				_sdlpath=$path_dir
-				if test `basename $path_dir` = bin || test `basename $path_dir` = sbin ; then
-					_sdlpath=`dirname $path_dir`
-				fi
 				# break at first sdl-config found in path
 				break 2
 			fi
@@ -3414,7 +3409,7 @@ if test -n "$_host"; then
 			_zlib=yes
 			;;
 		*mingw32*)
-			_sdlconfig=$_host-sdl-config
+			_sdlconfig=$_host-sdl2-config
 			_libcurlconfig=$_host-curl-config
 			_pkgconfig=$_host-pkg-config
 			_windres=$_host-windres
@@ -3741,11 +3736,11 @@ fi
 #
 if test "$_sdl" = auto ; then
 	find_sdlconfig
-	append_var SDL_CFLAGS "`$_sdlconfig --prefix="$_sdlpath" --cflags`"
+	append_var SDL_CFLAGS "`$_sdlconfig --cflags`"
 	if test "$_static_build" = yes ; then
-		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --static-libs`"
+		append_var SDL_LIBS "`$_sdlconfig --static-libs`"
 	else
-		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --libs`"
+		append_var SDL_LIBS "`$_sdlconfig --libs`"
 	fi
 	_sdlversion=`$_sdlconfig --version`