diff options
author | Eugene Sandulenko | 2019-11-12 23:25:36 +0100 |
---|---|---|
committer | Eugene Sandulenko | 2019-11-12 23:26:22 +0100 |
commit | 954aeccfb7c5305b524d9bd53453c13b82c6d6f5 (patch) | |
tree | 993442561414ab6cdb5d02e3bbef50633c678e74 /configure | |
parent | 6bbe67e23de6aa3b7d0c4b78393cc82d7088250f (diff) | |
download | scummvm-rg350-954aeccfb7c5305b524d9bd53453c13b82c6d6f5.tar.gz scummvm-rg350-954aeccfb7c5305b524d9bd53453c13b82c6d6f5.tar.bz2 scummvm-rg350-954aeccfb7c5305b524d9bd53453c13b82c6d6f5.zip |
CONFIGURE: Move pkg-config detection as early as possible
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -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" |