summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-06 23:01:40 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-06 23:01:40 +0300
commitc7cc189b3007321b09c0c49de74baeef5b18606a (patch)
treebb6503df94a089da1d92cc21799a12f559ab6eb1 /configure.ac
parent847260e5e91391a979f4292d130d7b6e3b43bdf1 (diff)
downloadManaVerse-c7cc189b3007321b09c0c49de74baeef5b18606a.tar.gz
ManaVerse-c7cc189b3007321b09c0c49de74baeef5b18606a.tar.bz2
ManaVerse-c7cc189b3007321b09c0c49de74baeef5b18606a.tar.xz
ManaVerse-c7cc189b3007321b09c0c49de74baeef5b18606a.zip
Fix and update internal sdl2_gfx files.
Used by default in SDL2 builds.
Diffstat (limited to 'configure.ac')
-rwxr-xr-xconfigure.ac10
1 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 5fea31696..e33861163 100755
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,9 @@ esac
AM_CONDITIONAL(MINGW, test x$mingw = xtrue)
+# 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) ] )
+
AC_DEFUN([AC_CHECK_SDL],
[
# Enable sdl2
@@ -242,8 +245,10 @@ if test "x$with_sdl2" == "xyes"; then
LIBS="$LIBS `$SDL_CONFIG --libs`"
CPPFLAGS="$CPPFLAGS `$SDL_CONFIG --cflags`"
fi
- LIBS="$LIBS `$PKG_CONFIG --libs SDL2_gfx`"
- CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_gfx`"
+ if test "x$with_internalsdlgfx" == "xno"; then
+ LIBS="$LIBS `$PKG_CONFIG --libs SDL2_gfx`"
+ CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_gfx`"
+ fi
LIBS="$LIBS `$PKG_CONFIG --libs SDL2_image`"
CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags SDL2_image`"
LIBS="$LIBS `$PKG_CONFIG --libs SDL2_mixer`"
@@ -316,7 +321,6 @@ 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