diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index f311aa6..4206e6b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1,44 +1,44 @@ | |||
1 | AC_INIT(mazeoflife, version-2.0) | 1 | AC_INIT(mazeoflife, version-3.0) |
2 | AC_PREREQ([2.59]) | 2 | AC_PREREQ([2.59]) |
3 | AM_INIT_AUTOMAKE([1.10 no-define foreign]) | 3 | AM_INIT_AUTOMAKE([1.10 no-define foreign]) |
4 | AC_PROG_CXX | 4 | AC_PROG_CXX |
5 | AC_CONFIG_FILES([Makefile]) | 5 | AC_CONFIG_FILES([Makefile]) |
6 | 6 | ||
7 | dnl Check for SDL | 7 | dnl Check for SDL |
8 | SDL_VERSION=1.2.0 | 8 | SDL_VERSION=2.0.0 |
9 | AM_PATH_SDL($SDL_VERSION, | 9 | AM_PATH_SDL2($SDL_VERSION, |
10 | :, | 10 | :, |
11 | AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) | 11 | AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) |
12 | ) | 12 | ) |
13 | CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" | 13 | CXXFLAGS="$CXXFLAGS $SDL_CFLAGS" |
14 | LIBS="$LIBS $SDL_LIBS" | 14 | LIBS="$LIBS $SDL_LIBS" |
15 | 15 | ||
16 | dnl Check for SDL_ttf | 16 | dnl Check for SDL2_ttf |
17 | AC_ARG_WITH([sdl-ttf-include-path], | 17 | AC_ARG_WITH([sdl-ttf2-include-path], |
18 | [AS_HELP_STRING([--with-sdl-ttf-include-path], | 18 | [AS_HELP_STRING([--with-sdl2-ttf-include-path], |
19 | [location of the SDL_ttf headers, defaults to /usr/include/SDL])], | 19 | [location of the SDL2_ttf headers, defaults to /usr/include/SDL2])], |
20 | [SDLTTF_CXXFLAGS="-I$withval"], | 20 | [SDLTTF_CXXFLAGS="-I$withval"], |
21 | [SDLTTF_CXXFLAGS="-I/usr/include/SDL"]) | 21 | [SDLTTF_CXXFLAGS="-I/usr/include/SDL2"]) |
22 | AC_SUBST([SDLTTF_CXXFLAGS]) | 22 | AC_SUBST([SDLTTF_CXXFLAGS]) |
23 | 23 | ||
24 | AC_ARG_WITH([sdl-ttf-lib-path], | 24 | AC_ARG_WITH([sdl2-ttf-lib-path], |
25 | [AS_HELP_STRING([--with-sdl-ttf-lib-path], [location of the SDL_ttf library])], | 25 | [AS_HELP_STRING([--with-sdl2-ttf-lib-path], [location of the SDL2_ttf library])], |
26 | [SDLTTF_LIBS="-L$withval -lsdl_ttf"], | 26 | [SDLTTF_LIBS="-L$withval -lsdl2_ttf"], |
27 | [SDLTTF_LIBS="-lsdl_ttf"]) | 27 | [SDLTTF_LIBS="-lsdl2_ttf"]) |
28 | AC_SUBST([SDLTTF_LIBS]) | 28 | AC_SUBST([SDLTTF_LIBS]) |
29 | 29 | ||
30 | dnl Check for SDL_net | 30 | dnl Check for SDL2_net |
31 | AC_ARG_WITH([sdl-net-include-path], | 31 | AC_ARG_WITH([sdl2-net-include-path], |
32 | [AS_HELP_STRING([--with-sdl-net-include-path], | 32 | [AS_HELP_STRING([--with-sdl2-net-include-path], |
33 | [location of the SDL_net headers, defaults to /usr/include/SDL])], | 33 | [location of the SDL2_net headers, defaults to /usr/include/SDL2])], |
34 | [SDLNET_CXXFLAGS="-I$withval"], | 34 | [SDLNET_CXXFLAGS="-I$withval"], |
35 | [SDLNET_CXXFLAGS="-I/usr/include/SDL"]) | 35 | [SDLNET_CXXFLAGS="-I/usr/include/SDL2"]) |
36 | AC_SUBST([SDLNET_CXXFLAGS]) | 36 | AC_SUBST([SDLNET_CXXFLAGS]) |
37 | 37 | ||
38 | AC_ARG_WITH([sdl-net-lib-path], | 38 | AC_ARG_WITH([sdl2-net-lib-path], |
39 | [AS_HELP_STRING([--with-sdl-net-lib-path], [location of the SDL_net library])], | 39 | [AS_HELP_STRING([--with-sdl2-net-lib-path], [location of the SDL2_net library])], |
40 | [SDLNET_LIBS="-L$withval -lsdl_net"], | 40 | [SDLNET_LIBS="-L$withval -lsdl2_net"], |
41 | [SDLNET_LIBS="-lsdl_net"]) | 41 | [SDLNET_LIBS="-lsdl2_net"]) |
42 | AC_SUBST([SDLNET_LIBS]) | 42 | AC_SUBST([SDLNET_LIBS]) |
43 | 43 | ||
44 | AC_OUTPUT \ No newline at end of file | 44 | AC_OUTPUT \ No newline at end of file |