From 102a7d4fe6e8874ad7dcdfe085a22b51de22999b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 5 Nov 2013 20:56:20 +0300 Subject: add configure option --without-internalsdlgfx for not use emdedded sdl2gfx. --- configure.ac | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 367fa66cc..a52c94108 100755 --- a/configure.ac +++ b/configure.ac @@ -90,12 +90,6 @@ if test "x$with_sdl2" == "xyes"; then AC_MSG_ERROR([ *** Unable to find SDL2_mixer library (http://www.libsdl.org/projects/SDL_mixer/)])) -# disabled for now -# AC_CHECK_LIB(SDL2_gfx, rotozoomSurfaceXY, , -# AC_MSG_ERROR([ *** Unable to find SDL2_gfx library (http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx)])) -# AC_CHECK_HEADERS(SDL_rotozoom.h, ,) - -# using embedded sdl2gfx AC_CHECK_LIB(SDL2_net, SDLNet_Init, , AC_MSG_ERROR([ *** Unable to find SDL2_net library])) @@ -137,6 +131,20 @@ fi AM_CONDITIONAL(USE_SDL2, test x$with_sdl2 = xyes) +# Option to enable internal sdl-gfx for SDL2 (for now it enabled by default) +AC_ARG_WITH(internalsdlgfx,[ --without-internalsdlgfx don't use internal sdlgfx (for SDL2 only) ] ) +if test "x$with_internalsdlgfx" == "xno"; then + with_internalsdlgfx=no + + AC_CHECK_LIB(SDL2_gfx, rotozoomSurfaceXY, , + AC_MSG_ERROR([ *** Unable to find SDL2_gfx library (http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx)])) + AC_CHECK_HEADERS(SDL_rotozoom.h, ,) +else + with_internalsdlgfx=yes + AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2]) +fi +AM_CONDITIONAL(USE_INTERNALSDLGFX, test x$with_internalsdlgfx = xyes) + # Search for *-config AC_PATH_PROG(PKG_CONFIG, pkg-config) AC_PATH_PROG(CURL_CONFIG, curl-config) -- cgit v1.2.3-70-g09d2