[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH] configure: Fix build with pkg-config and --static
From: |
Thomas Huth |
Subject: |
[Qemu-trivial] [PATCH] configure: Fix build with pkg-config and --static --enable-sdl |
Date: |
Tue, 13 Jun 2017 20:00:44 +0200 |
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 <address@hidden>
---
configure | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 13e040d..3b89de6 100755
--- a/configure
+++ b/configure
@@ -2671,7 +2671,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
--
1.8.3.1
- [Qemu-trivial] [PATCH] configure: Fix build with pkg-config and --static --enable-sdl,
Thomas Huth <=