From 9063a6a64c720129f48054fbf05222637180b1ba Mon Sep 17 00:00:00 2001
From: "Ryan C. Gordon" <icculus@icculus.org>
Date: Wed, 15 Aug 2012 23:48:59 -0400
Subject: [PATCH] Check for sdl2-config when doing the SDL version test.

---
 acinclude.m4 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 99f8af3..6a09e67 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -27,7 +27,15 @@ AC_ARG_ENABLE(sdltest, [  --disable-sdltest       Do not try to compile and run
 
   AC_REQUIRE([AC_CANONICAL_TARGET])
   PATH="$prefix/bin:$prefix/usr/bin:$PATH"
-  AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH])
+  AC_PATH_PROG(SDL1_CONFIG, sdl-config, no, [$PATH])
+  AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH])
+
+  if test "$SDL2_CONFIG" != "no" ; then
+    SDL_CONFIG=$SDL2_CONFIG
+  else
+    SDL_CONFIG=$SDL1_CONFIG
+  fi
+
   min_sdl_version=ifelse([$1], ,0.11.0,$1)
   AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
   no_sdl=""