From 3377b974f347ef86dfcba3dd299f3751c9a88c69 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Wed, 6 Jun 2012 09:37:25 +0000
Subject: Close #1529:  - replaced obsoleted SDL constants SDL_*_OVERLAY  -
 updated build config/scripts

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4157 74dad513-b988-da41-8d7b-12977e46ad98
---
 aconfigure.ac | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'aconfigure.ac')

diff --git a/aconfigure.ac b/aconfigure.ac
index ac38d8f8..6d02189c 100644
--- a/aconfigure.ac
+++ b/aconfigure.ac
@@ -852,23 +852,26 @@ AC_ARG_ENABLE(sdl,
 		fi
 	      ],
 	      [
-		  SDL_CONFIG="sdl-config"
 		  if test "x$with_sdl" != "xno" -a "x$with_sdl" != "x"; then
-			SDL_CONFIG=$with_sdl/bin/sdl-config
 			AC_MSG_RESULT([Using SDL prefix... $with_sdl])
+			AC_PATH_PROGS(SDL_CONFIG,sdl-config sdl2-config,,$with_sdl/bin)
+                  else
+			AC_PATH_PROGS(SDL_CONFIG, sdl-config sdl2-config)
 		  fi
-	      
-		  AC_MSG_CHECKING([SDL availability..])
-		  if (sh -c "$SDL_CONFIG --version" | grep 1.3) then
-			  AC_SUBST(ac_sdl_cflags)
-			  AC_SUBST(ac_sdl_ldflags)
-			  ac_sdl_cflags=`$SDL_CONFIG --cflags`
-			  ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
-			  ac_sdl_ldflags=`$SDL_CONFIG --libs`
-			  LIBS="$LIBS $ac_sdl_ldflags"
-		   else
+		  
+		  AC_MSG_CHECKING([SDL availability])
+		  if test "x$SDL_CONFIG" = "x"; then
+			AC_MSG_RESULT([not found])
+		  elif (sh -c "$SDL_CONFIG --version" | grep -e '^1\.3' -e '^2\.') then
+			AC_SUBST(ac_sdl_cflags)
+			AC_SUBST(ac_sdl_ldflags)
+			ac_sdl_cflags=`$SDL_CONFIG --cflags`
+			ac_sdl_cflags="-DPJMEDIA_VIDEO_DEV_HAS_SDL=1 $ac_sdl_cflags"
+			ac_sdl_ldflags=`$SDL_CONFIG --libs`
+			LIBS="$LIBS $ac_sdl_ldflags"
+		  else
 			AC_MSG_RESULT([Unsupported SDL version])
-		   fi
+		  fi
 	      ])
 
 
-- 
cgit v1.2.3