From bea1b04f96502741f1e3b0f0c4c7fe506306baa0 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Tue, 6 Jan 2015 19:56:11 +0000
Subject: Corrected SDL2 variable names in configure.

---
 configure.ac | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8ded43b..911ae81 100644
--- a/configure.ac
+++ b/configure.ac
@@ -425,7 +425,7 @@ else
 	dnl
 
 	LIBS_save="$LIBS"
-	LIBS="$LIBS -lvorbis -l ogg"
+	LIBS="$LIBS -lvorbis -logg"
 
 	AC_CHECK_HEADER(vorbis/vorbisfile.h,
 			[],
@@ -447,34 +447,34 @@ else
 	AC_SUBST(LIBVORBISFILE_LIBS)
 
 	dnl ---------------------------------------------------------------
-	dnl SDL
+	dnl SDL2
 	dnl
 
 	AC_MSG_CHECKING([looking for SDL2])
-	KDE_FIND_PATH(sdl2-config, LIBSDL_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
+	KDE_FIND_PATH(sdl2-config, LIBSDL2_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
 			AC_MSG_ERROR([SDL2 not found])
 	])
 		
-	if test -n "$LIBSDL_CONFIG"; then
-		LIBSDL_LIBS="`$LIBSDL_CONFIG --libs`"
-		LIBSDL_RPATH=
-		for args in $LIBSDL_LIBS; do
+	if test -n "$LIBSDL2_CONFIG"; then
+		LIBSDL2_LIBS="`$LIBSDL2_CONFIG --libs`"
+		LIBSDL2_RPATH=
+		for args in $LIBSDL2_LIBS; do
 		case $args in
 			-L*)
-			LIBSDL_RPATH="$LIBSDL_RPATH $args"
+			LIBSDL2_RPATH="$LIBSDL2_RPATH $args"
 			;;
 		esac
 		done
 		
-		LIBSDL_RPATH=`echo $LIBSDL_RPATH | sed -e "s/-L/-R/g"`
-		LIBSDL_CFLAGS="`$LIBSDL_CONFIG --cflags`"
+		LIBSDL2_RPATH=`echo $LIBSDL2_RPATH | sed -e "s/-L/-R/g"`
+		LIBSDL2_CFLAGS="`$LIBSDL2_CONFIG --cflags`"
 	fi
 		
 	AC_MSG_RESULT($HAVE_LIBSDL)
 		
-	AC_SUBST(LIBSDL_LIBS)
-	AC_SUBST(LIBSDL_CFLAGS)
-	AC_SUBST(LIBSDL_RPATH)
+	AC_SUBST(LIBSDL2_LIBS)
+	AC_SUBST(LIBSDL2_CFLAGS)
+	AC_SUBST(LIBSDL2_RPATH)
 
 	BUILD_CLIENT=yes
 	AC_DEFINE_UNQUOTED(BUILD_CLIENT, 1, [Define this to build the client])
@@ -561,7 +561,7 @@ curses ............. $HAVE_CURSES
 build client ....... $BUILD_CLIENT])
 
 if test "x$BUILD_CLIENT" = xyes; then
-AC_MSG_RESULT([SDL2 ............... $LIBSDL_LIBS
+AC_MSG_RESULT([SDL2 ............... $LIBSDL2_LIBS
 opengl ............. $GL_LIBS
 openal ............. $AL_LIBS]
 vorbisfile ......... $LIBVORBISFILE_LIBS)
-- 
cgit v1.2.3