From eefd5e77523b41f628746b45c41ded739c8e8136 Mon Sep 17 00:00:00 2001
From: yabause <yabause@users.sf.net>
Date: Sat, 8 Apr 2006 14:23:26 +0000
Subject: [PATCH] Moved the SDL test in linux only part, as it isn't needed for
 windows.

---
 desmume/configure.ac | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/desmume/configure.ac b/desmume/configure.ac
index 0dd310d1a..9fd2f9425 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -16,15 +16,6 @@ AC_C_BIGENDIAN
 
 AC_PATH_PROGS(HAVE_LIBSDL, [sdl-config sdl11-config])
 
-if test x$HAVE_LIBSDL = x ; then
-        AC_MSG_ERROR([You need to install SDL])
-else
-        SDL_CFLAGS=`$HAVE_LIBSDL --cflags`
-        SDL_LIBS=`$HAVE_LIBSDL --libs`
-	CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"
-	LIBS="$LIBS $SDL_LIBS"
-fi
-
 case $target in
 	*linux*)
 		AC_CHECK_TOOL(HAVE_PKG, pkg-config)
@@ -32,10 +23,19 @@ case $target in
 		if test ! x$HAVE_PKG = x ; then
 			GTK_CFLAGS=`$HAVE_PKG gtk+-2.0 --cflags`
 			GTK_LIBS=`$HAVE_PKG gtk+-2.0 --libs`
-			AC_SUBST(GTK_CFLAGS)
-			AC_SUBST(GTK_LIBS)
 		fi
 
+		if test x$HAVE_LIBSDL = x ; then
+        		AC_MSG_ERROR([You need to install SDL])
+		else
+		        SDL_CFLAGS=`$HAVE_LIBSDL --cflags`
+		        SDL_LIBS=`$HAVE_LIBSDL --libs`
+			GTK_CFLAGS="$GTK_CFLAGS $SDL_CFLAGS"
+			GTK_LIBS="$GTK_LIBS $SDL_LIBS"
+		fi
+		AC_SUBST(GTK_CFLAGS)
+		AC_SUBST(GTK_LIBS)
+
 		UI_DIR=gtk
 		AC_SUBST([UI_DIR])
 		;;