ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sdl mandatory, build fails anyway as found by Guillame.

This commit is contained in:
riccardom 2010-05-12 14:23:56 +00:00
parent b2af2527fe
commit dd77b3aeda
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
desmume/configure.ac
View File

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