configure: Fix build with pkg-config and --static --enable-sdl
authorThomas Huth <thuth@redhat.com>
Tue, 13 Jun 2017 18:00:44 +0000 (20:00 +0200)
committerMichael Tokarev <mjt@tls.msk.ru>
Tue, 11 Jul 2017 08:18:37 +0000 (11:18 +0300)
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>
configure

index 806658c98b28d4f0c34a7b1023011667e79c5d6d..ce7e8aa84267dd9f20417235ffcaab0a79ce3c35 100755 (executable)
--- 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