summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-11-30 23:10:07 +0300
committerAndrei Karas <akaras@inbox.ru>2015-11-30 23:36:18 +0300
commit905dcdea2a987c6c45bae020d60afcf6e7ef10bd (patch)
tree2dbebec08f878fb8488102f9d2e7ea8f0d3471b4
parenta7e43b872137aabb8b0c92037ae69a4555948fe7 (diff)
downloadmv-905dcdea2a987c6c45bae020d60afcf6e7ef10bd.tar.gz
mv-905dcdea2a987c6c45bae020d60afcf6e7ef10bd.tar.bz2
mv-905dcdea2a987c6c45bae020d60afcf6e7ef10bd.tar.xz
mv-905dcdea2a987c6c45bae020d60afcf6e7ef10bd.zip
In configure move SDL check code into function AC_CHECK_SDL.
-rwxr-xr-xconfigure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 2a9f80904..4cecd7663 100755
--- a/configure.ac
+++ b/configure.ac
@@ -83,6 +83,8 @@ AC_TYPE_SSIZE_T
AM_GNU_GETTEXT([external],[need-ngettext])
AM_GNU_GETTEXT_VERSION([0.16.1])
+AC_DEFUN([AC_CHECK_SDL],
+[
# Enable sdl2
AC_ARG_WITH(sdl2,[ --with-sdl2 enable SDL 2 support] )
if test "x$with_sdl2" == "xyes"; then
@@ -104,8 +106,6 @@ if test "x$with_sdl2" == "xyes"; then
AC_CHECK_LIB([SDL2_mixer], [Mix_OpenAudio], ,
AC_MSG_ERROR([ *** Unable to find SDL2_mixer library (http://www.libsdl.org/projects/SDL_mixer/)]))
-
-
AC_CHECK_LIB(SDL2_net, SDLNet_Init, ,
AC_MSG_ERROR([ *** Unable to find SDL2_net library]))
@@ -121,7 +121,6 @@ else
AC_CHECK_LIB([SDL], [SDL_Init], ,
AC_MSG_ERROR([ *** Unable to find SDL library (http://www.libsdl.org/)]))
-
AC_CHECK_LIB(SDL_image, IMG_LoadPNG_RW, ,
AC_MSG_ERROR([ *** Unable to find SDL_image library with PNG support
(http://www.libsdl.org/projects/SDL_image/)]))
@@ -132,7 +131,6 @@ else
AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio], ,
AC_MSG_ERROR([ *** Unable to find SDL_mixer library (http://www.libsdl.org/projects/SDL_mixer/)]))
-
AC_CHECK_LIB(SDL_gfx, rotozoomSurfaceXY, ,
AC_MSG_ERROR([ *** Unable to find SDL_gfx library (http://www.ferzkopp.net/joomla/software-mainmenu-14/4-ferzkopps-linux-software/19-sdlgfx)]))
AC_CHECK_HEADERS(SDL_rotozoom.h, ,)
@@ -159,6 +157,9 @@ else
AC_DEFINE(USE_INTERNALSDLGFX, 1, [Defines if ManaPlus should use internal sdlgfx2])
fi
AM_CONDITIONAL(USE_INTERNALSDLGFX, test x$with_internalsdlgfx = xyes)
+])
+
+AC_CHECK_SDL()
# Search for *-config
AC_PATH_PROG(PKG_CONFIG, pkg-config)