aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2017-06-13 20:00:44 +0200
committerMichael Tokarev <mjt@tls.msk.ru>2017-07-11 11:18:37 +0300
commit5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc (patch)
treef1064f9499784640011cce7cac31d9f1687ee247 /configure
parent3bcf7d7df552c8bd4fdfe70b753f45169407cacb (diff)
downloadqemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.zip
qemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.tar.gz
qemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.tar.bz2
configure: Fix build with pkg-config and --static --enable-sdl
The configure script prefers pkg-config over sdl-config, but the "--static-libs" parameter only exists for the latter. With pkg-config, "--static --libs" have to be used instead. Buglink: https://bugs.launchpad.net/qemu/+bug/984516 Signed-off-by: Thomas Huth <thuth@redhat.com> Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index 806658c..ce7e8aa 100755
--- a/configure
+++ b/configure
@@ -2733,7 +2733,11 @@ int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
sdl_cflags=$($sdlconfig --cflags 2>/dev/null)
if test "$static" = "yes" ; then
- sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
+ if $pkg_config $sdlname --exists; then
+ sdl_libs=$($pkg_config $sdlname --static --libs 2>/dev/null)
+ else
+ sdl_libs=$($sdlconfig --static-libs 2>/dev/null)
+ fi
else
sdl_libs=$($sdlconfig --libs 2>/dev/null)
fi