summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Lantinga <slouken@libsdl.org>2012-01-30 21:39:26 -0500
committerSam Lantinga <slouken@libsdl.org>2012-01-30 21:39:26 -0500
commit5d34085e174785da050cdf8fcacc95612a6568ef (patch)
tree7a313397f558d09d531cfd880eed518977d5af94
parent960f2a8335854966dc65116a842c4145bbd5e33f (diff)
downloadsdl-5d34085e174785da050cdf8fcacc95612a6568ef.tar.gz
Switched the SDL 2 autoconf macro to AM_PATH_SDL2
-rw-r--r--sdl2.m42
-rw-r--r--test/acinclude.m42
-rw-r--r--test/aclocal.m42
-rw-r--r--test/configure.in2
4 files changed, 4 insertions, 4 deletions
diff --git a/sdl2.m4 b/sdl2.m4
index c060ce818..302b419c0 100644
--- a/sdl2.m4
+++ b/sdl2.m4
@@ -10,7 +10,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN([AM_PATH_SDL2],
[dnl
dnl Get the cflags and libraries from the sdl2-config script
dnl
diff --git a/test/acinclude.m4 b/test/acinclude.m4
index 1124207c3..ead69e514 100644
--- a/test/acinclude.m4
+++ b/test/acinclude.m4
@@ -10,7 +10,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN([AM_PATH_SDL2],
[dnl
dnl Get the cflags and libraries from the sdl2-config script
dnl
diff --git a/test/aclocal.m4 b/test/aclocal.m4
index 1124207c3..ead69e514 100644
--- a/test/aclocal.m4
+++ b/test/aclocal.m4
@@ -10,7 +10,7 @@
dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS
dnl
-AC_DEFUN([AM_PATH_SDL],
+AC_DEFUN([AM_PATH_SDL2],
[dnl
dnl Get the cflags and libraries from the sdl2-config script
dnl
diff --git a/test/configure.in b/test/configure.in
index 8af776f59..263c3529a 100644
--- a/test/configure.in
+++ b/test/configure.in
@@ -66,7 +66,7 @@ AC_SUBST(MATHLIB)
dnl Check for SDL
SDL_VERSION=2.0.0
-AM_PATH_SDL($SDL_VERSION,
+AM_PATH_SDL2($SDL_VERSION,
:,
AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!])
)