[Scummvm-git-logs] scummvm master -> 3a4b032bfcd43f53e1533e52e6d6a533aa4232cf

[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:
3a4b032bfc CONFIGURE: Fix libmikmod detection under macOS homebrew


Commit: 3a4b032bfcd43f53e1533e52e6d6a533aa4232cf
    https://github.com/scummvm/scummvm/commit/3a4b032bfcd43f53e1533e52e6d6a533aa4232cf
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-25T00:11:10+01:00

Commit Message:
CONFIGURE: Fix libmikmod detection under macOS homebrew

Changed paths:
    configure


diff --git a/configure b/configure
index d66522d15a8..ffce29c9b1b 100755
--- a/configure
+++ b/configure
@@ -5731,20 +5731,17 @@ define_in_config_if_yes "$_libcurl" "USE_LIBCURL"
 #
 # Check for libmikmod to be present
 #
-echocheck "libmikmod"
 if test "$_libmikmod" != "no"; then
 
 	# Look for the mikmod-config script
 	find_libmikmodconfig
 
+	echocheck "libmikmod"
+
 	if test -z "$_libmikmodconfig"; then
 		_libmikmod=no
 	else
-		if test -n "$_staticlibpath"; then
-			LIBMIKMOD_LIBS=`$_libmikmodconfig --static-libs`
-		else
-			LIBMIKMOD_LIBS=`$_libmikmodconfig --libs`
-		fi
+		LIBMIKMOD_LIBS=`$_libmikmodconfig --libs`
 		LIBMIKMOD_CFLAGS=`$_libmikmodconfig --cflags`
 
 		if test "$_libmikmod" = "auto"; then
@@ -5758,19 +5755,20 @@ if test "$_libmikmod" != "no"; then
 				return 0;
 			}
 EOF
-		cc_check $LIBMIKMOD_CFLAGS $LIBMIKMOD_LIBS && _libmikmod=yes
+			cc_check $LIBMIKMOD_CFLAGS $LIBMIKMOD_LIBS && _libmikmod=yes
 		fi
 
 		if test "$_libmikmod" = "yes"; then
 			append_var LIBS "$LIBMIKMOD_LIBS"
 			append_var INCLUDES "$LIBMIKMOD_CFLAGS"
 		fi
+
+		echo "$_libmikmod"
+
 	fi
 
 fi
 
-echo "$_libmikmod"
-
 define_in_config_if_yes "$_libmikmod" "USE_MIKMOD"
 
 #