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

[sev-]

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:
954aeccfb7 CONFIGURE: Move pkg-config detection as early as possible
3d75d40acb CONFIGURE: Detect SDL_Net with pkg-config when available


Commit: 954aeccfb7c5305b524d9bd53453c13b82c6d6f5
    https://github.com/scummvm/scummvm/commit/954aeccfb7c5305b524d9bd53453c13b82c6d6f5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-12T23:26:22+01:00

Commit Message:
CONFIGURE: Move pkg-config detection as early as possible

Changed paths:
    configure


diff --git a/configure b/configure
index 20f763b..a0413b6 100755
--- a/configure
+++ b/configure
@@ -3756,6 +3756,18 @@ esac
 append_var MODULES "backends/platform/$_backend"
 
 #
+# Check for pkg-config
+#
+echocheck "pkg-config"
+_pkg_config=no
+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
+	echo "WARNING: When cross-compiling PKG_CONFIG_LIBDIR must be set to the location of the .pc files for the target"
+fi
+
+#
 # Setup SDL specifics for SDL based backends
 #
 if test "$_sdl" = auto ; then
@@ -4225,18 +4237,6 @@ EOF
 cc_check -lm && append_var LIBS "-lm"
 
 #
-# Check for pkg-config
-#
-echocheck "pkg-config"
-_pkg_config=no
-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
-	echo "WARNING: When cross-compiling PKG_CONFIG_LIBDIR must be set to the location of the .pc files for the target"
-fi
-
-#
 # Check for Ogg
 #
 echocheck "Ogg"


Commit: 3d75d40acbaf8a259f2f16e1f78544140d2e3626
    https://github.com/scummvm/scummvm/commit/3d75d40acbaf8a259f2f16e1f78544140d2e3626
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-11-12T23:26:22+01:00

Commit Message:
CONFIGURE: Detect SDL_Net with pkg-config when available

Changed paths:
    configure


diff --git a/configure b/configure
index a0413b6..146c424 100755
--- a/configure
+++ b/configure
@@ -3800,10 +3800,20 @@ if test "$_sdl" = yes ; then
 	case $_sdlversion in
 		2.0.*)
 			add_line_to_config_mk "USE_SDL2 = 1"
-			append_var SDL_NET_LIBS "-lSDL2_net"
+			if test "$_pkg_config" = "yes" && $_pkgconfig --exists sdl2_net; then
+				append_var SDL_NET_LIBS "`$_pkgconfig --libs sdl2_net`"
+				append_var SDL_NET_CFLAGS "`$_pkgconfig --cflags sdl2_net`"
+			else
+				append_var SDL_NET_LIBS "-lSDL2_net"
+			fi
 			;;
 		*)
-			append_var SDL_NET_LIBS "-lSDL_net"
+			if test "$_pkg_config" = "yes" && $_pkgconfig --exists sdl_net; then
+				append_var SDL_NET_LIBS "`$_pkgconfig --libs sdl_net`"
+				append_var SDL_NET_CFLAGS "`$_pkgconfig --cflags sdl_net`"
+			else
+				append_var SDL_NET_LIBS "-lSDL_net"
+			fi
 			;;
 	esac