diff options
| author | Thomas Huth | 2017-06-13 20:00:44 +0200 |
|---|---|---|
| committer | Michael Tokarev | 2017-07-11 10:18:37 +0200 |
| commit | 5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc (patch) | |
| tree | f1064f9499784640011cce7cac31d9f1687ee247 | |
| parent | util/qemu-sockets: Drop unused helper socket_address_to_string() (diff) | |
| download | qemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.tar.gz qemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.tar.xz qemu-5f37e6d4a7b22ccf1bb8fa4eb35784d90ff78fbc.zip | |
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>
| -rwxr-xr-x | configure | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 |