diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-31 03:33:34 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-31 03:33:34 +0300 |
| commit | c0255f61476a509780d316801a6a3d54c2f362ec (patch) | |
| tree | a00a6f266cc51e9f1a7c26be495b295fadc96b7d | |
| parent | a05410935d91ce5e66141208ff862cd328e7fba6 (diff) | |
| download | manaplus-c0255f61476a509780d316801a6a3d54c2f362ec.tar.gz manaplus-c0255f61476a509780d316801a6a3d54c2f362ec.tar.bz2 manaplus-c0255f61476a509780d316801a6a3d54c2f362ec.tar.xz manaplus-c0255f61476a509780d316801a6a3d54c2f362ec.zip | |
Use pkg_config for all SDL libs in configure.
| -rwxr-xr-x | configure.ac | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 080bdf791..b1e65934b 100755 --- a/configure.ac +++ b/configure.ac @@ -137,6 +137,17 @@ if test "x$with_sdl2" == "xyes"; then LIBS="`$SDL_CONFIG --libs` $LIBS" CPPFLAGS="`$SDL_CONFIG --cflags` $CPPFLAGS" fi + LIBS="`$PKG_CONFIG --libs SDL2_gfx` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL2_gfx` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL2_image` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL2_image` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL2_mixer` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL2_mixer` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL2_net` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL2_net` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL2_ttf` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL2_ttf` $CPPFLAGS" + AC_CHECK_LIB([SDL2], [SDL_Init], , AC_MSG_ERROR([ *** Unable to find SDL2 library (http://www.libsdl.org/)])) @@ -160,6 +171,16 @@ else LIBS="`$SDL_CONFIG --libs` $LIBS" CPPFLAGS="`$SDL_CONFIG --cflags` $CPPFLAGS" fi + LIBS="`$PKG_CONFIG --libs SDL_gfx` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL_gfx` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL_image` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL_image` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL_mixer` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL_mixer` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL_net` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL_net` $CPPFLAGS" + LIBS="`$PKG_CONFIG --libs SDL_ttf` $LIBS" + CPPFLAGS="`$PKG_CONFIG --cflags SDL_ttf` $CPPFLAGS" if test "x$naclbuild_enabled" == "xfalse"; then AC_CHECK_LIB([SDL], [SDL_Init], , |