[Scummvm-git-logs] scummvm master -> 66813c9fc21ada8da516c25c9f71b6b83a5f25b8

[bluegr]

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

Summary:
8b5bb41a2e CONFIGURE: allow pkg-config override
66813c9fc2 CONFIGURE: Override pkg-config on RISC OS


Commit: 8b5bb41a2e37d7c4f7df296b230ca0c37983e305
    https://github.com/scummvm/scummvm/commit/8b5bb41a2e37d7c4f7df296b230ca0c37983e305
Author: cpasjuste (cpasjuste at gmail.com)
Date: 2019-04-09T20:57:11+03:00

Commit Message:
CONFIGURE: allow pkg-config override

Changed paths:
    configure


diff --git a/configure b/configure
index 0ac4997..ec73ac3 100755
--- a/configure
+++ b/configure
@@ -215,6 +215,7 @@ _amigaospath="Games:ScummVM"
 _staticlibpath=
 _xcodetoolspath=
 _sparklepath=
+_pkgconfig=pkg-config
 _sdlconfig=sdl2-config
 _libcurlconfig=curl-config
 _freetypeconfig=freetype-config
@@ -4087,7 +4088,7 @@ cc_check -lm && append_var LIBS "-lm"
 #
 echocheck "pkg-config"
 _pkg_config=no
-command -v pkg-config >/dev/null 2>&1 && _pkg_config=yes
+command -v $_pkgconfig >/dev/null 2>&1 && _pkg_config=yes
 echo "$_pkg_config"
 
 if test "$_pkg_config" = yes && test -n "$_host" && test -z "$PKG_CONFIG_LIBDIR"; then
@@ -4820,8 +4821,8 @@ if test "$_libunity" = auto ; then
 			;;
 		*)
 			# Unity has a lots of dependencies, update the libs and cflags var with them
-			LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
-			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
+			LIBUNITY_LIBS="$LIBUNITY_LIBS `$_pkgconfig --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
+			LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `$_pkgconfig --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
 			_libunity=no
 			cat > $TMPC << EOF
 #include <unity.h>
@@ -4836,8 +4837,8 @@ EOF
 fi
 if test "$_libunity" = yes ; then
 	if test "$LIBUNITY_CFLAGS" = "" || test "$LIBUNITY_LIBS" = ""; then
-		LIBUNITY_LIBS="$LIBUNITY_LIBS `pkg-config --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
-		LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `pkg-config --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
+		LIBUNITY_LIBS="$LIBUNITY_LIBS `$_pkgconfig --libs 'unity > 3.8.1' 2>> "$TMPLOG"`"
+		LIBUNITY_CFLAGS="$LIBUNITY_CFLAGS `$_pkgconfig --cflags 'unity > 3.8.1' 2>> "$TMPLOG"`"
 	fi
 	append_var LIBS "$LIBUNITY_LIBS"
 	append_var CXXFLAGS "$LIBUNITY_CFLAGS"
@@ -4855,10 +4856,10 @@ find_freetype() {
         # pkg-config.
         # As of freetype-2.9.1 the freetype-config file
         # no longer gets installed by default.
-	if test "$_pkg_config" = "yes" && pkg-config --exists freetype2; then
-		FREETYPE2_LIBS=`pkg-config --libs freetype2`
-		FREETYPE2_CFLAGS=`pkg-config --cflags freetype2`
-		FREETYPE2_STATIC_LIBS=`pkg-config --static --libs freetype2`
+	if test "$_pkg_config" = "yes" && $_pkgconfig --exists freetype2; then
+		FREETYPE2_LIBS=`$_pkgconfig --libs freetype2`
+		FREETYPE2_CFLAGS=`$_pkgconfig --cflags freetype2`
+		FREETYPE2_STATIC_LIBS=`$_pkgconfig --static --libs freetype2`
 		_freetype_found="true"
 	else
 		# Look for the freetype-config script


Commit: 66813c9fc21ada8da516c25c9f71b6b83a5f25b8
    https://github.com/scummvm/scummvm/commit/66813c9fc21ada8da516c25c9f71b6b83a5f25b8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2019-04-09T20:57:11+03:00

Commit Message:
CONFIGURE: Override pkg-config on RISC OS

Changed paths:
    configure


diff --git a/configure b/configure
index ec73ac3..6075aa2 100755
--- a/configure
+++ b/configure
@@ -2876,6 +2876,7 @@ case $_host_os in
 		add_line_to_config_mk 'RISCOS = 1'
 		append_var LDFLAGS "-L$GCCSDK_INSTALL_ENV/lib"
 		append_var CXXFLAGS "-I$GCCSDK_INSTALL_ENV/include"
+		_pkgconfig=$GCCSDK_INSTALL_ENV/ro-pkg-config
 		_sdlpath=$GCCSDK_INSTALL_ENV/bin
 		_freetypepath=$GCCSDK_INSTALL_ENV/bin
 		_libcurlpath=$GCCSDK_INSTALL_ENV/bin