From dd77b3aeda067d23aa13e9d9d14bdfd68c5e943b Mon Sep 17 00:00:00 2001
From: riccardom <riccardom@users.sf.net>
Date: Wed, 12 May 2010 14:23:56 +0000
Subject: [PATCH] Make sdl mandatory, build fails anyway as found by Guillame.

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

diff --git a/desmume/configure.ac b/desmume/configure.ac
index 2bf135fef..fc6d6660b 100644
--- a/desmume/configure.ac
+++ b/desmume/configure.ac
@@ -62,9 +62,8 @@ if test ! "x$SDLCONFIG" = "x" ; then
   SDL_LIBS=`$SDLCONFIG --libs`
   AC_SUBST(SDL_CFLAGS)
   AC_SUBST(SDL_LIBS)
-  HAVE_SDL="yes"
 else
-  HAVE_SDL="no"
+  AC_MSG_ERROR([sdl is required to build desmume])
 fi
 
 dnl - Check for the OpenGL includes
@@ -230,32 +229,29 @@ AM_CONDITIONAL([HAVE_WX], [test "x$wxwidgets" = "xyes"])
 
 dnl - Determine which UIs to build and if po/ should be included
 PO_DIR=""
-if test "x$HAVE_SDL" = "xyes"; then
-  UI_DIR="cli $UI_DIR"
-  if test "x$HAVE_GTK" = "xyes"; then
-    UI_DIR="gtk $UI_DIR"
-  fi
-  if test "x$wxwin" = "xyes"; then
-    UI_DIR="wx $UI_DIR"
-  fi
+UI_DIR="cli $UI_DIR"
+if test "x$HAVE_GTK" = "xyes"; then
+  UI_DIR="gtk $UI_DIR"
+fi
+if test "x$wxwin" = "xyes"; then
+  UI_DIR="wx $UI_DIR"
+fi
 
-  if test "x$HAVE_LIBGLADE" = "xyes"; then
-    AC_PROVIDE_IFELSE([IT_PROG_INTLTOOL],[
-      # libglade requires SDL too
-      UI_DIR="gtk-glade $UI_DIR"
+if test "x$HAVE_LIBGLADE" = "xyes"; then
+  AC_PROVIDE_IFELSE([IT_PROG_INTLTOOL],[
+    UI_DIR="gtk-glade $UI_DIR"
 
-      dnl -- localization for gtk-glade UI
-      GETTEXT_PACKAGE=desmume
-      AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package name])
-      AC_SUBST(GETTEXT_PACKAGE)
-      ALL_LINGUAS="fr nb pt_BR sv zh_CN zh_TW"
-      AM_GLIB_GNU_GETTEXT
-      PO_DIR="po"
-      PO_MAKEFILE="po/Makefile.in"
-    ],[
-      echo "WARNING: intltool and/or gettext are not available therefore the gtk-glade interface won't be installed. The gtk-glade UI requires intltool and gettext."
-    ])
-  fi
+    dnl -- localization for gtk-glade UI
+    GETTEXT_PACKAGE=desmume
+    AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the gettext package name])
+    AC_SUBST(GETTEXT_PACKAGE)
+    ALL_LINGUAS="fr nb pt_BR sv zh_CN zh_TW"
+    AM_GLIB_GNU_GETTEXT
+    PO_DIR="po"
+    PO_MAKEFILE="po/Makefile.in"
+  ],[
+    echo "WARNING: intltool and/or gettext are not available therefore the gtk-glade interface won't be installed."
+  ])
 fi
 
 dnl - wifi support