[Scummvm-git-logs] scummvm master -> 149681cfad6ca24de882355b9175dd9c85038112

[sev-]

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:
149681cfad Revert "CONFIGURE: Do not pass --prefix to sdl2-config"


Commit: 149681cfad6ca24de882355b9175dd9c85038112
    https://github.com/scummvm/scummvm/commit/149681cfad6ca24de882355b9175dd9c85038112
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-01T09:40:58+02:00

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

This reverts commit 936121a070e4408f9b41b4234861fe2c1fab7949.

The change broke the existing Win32 ports.

Changed paths:
    configure


diff --git a/configure b/configure
index b6e96371da..9268cbcf99 100755
--- a/configure
+++ b/configure
@@ -462,6 +462,11 @@ 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
@@ -3736,11 +3741,11 @@ fi
 #
 if test "$_sdl" = auto ; then
 	find_sdlconfig
-	append_var SDL_CFLAGS "`$_sdlconfig --cflags`"
+	append_var SDL_CFLAGS "`$_sdlconfig --prefix="$_sdlpath" --cflags`"
 	if test "$_static_build" = yes ; then
-		append_var SDL_LIBS "`$_sdlconfig --static-libs`"
+		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --static-libs`"
 	else
-		append_var SDL_LIBS "`$_sdlconfig --libs`"
+		append_var SDL_LIBS "`$_sdlconfig --prefix="$_sdlpath" --libs`"
 	fi
 	_sdlversion=`$_sdlconfig --version`