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

Readd glib checks which are needed to build on linux. Then force the dependency on pkg-config because without it we don't have glib which is mandatory.

This commit is contained in:
riccardom 2009-10-10 20:32:25 +00:00
parent dd0286c96c
commit 481642bc65
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
desmume/configure.ac
View File

@ -88,17 +88,17 @@ if test "x$osmesa" = "xyes" ; then
fi fi
dnl - Check for GTK and/or libglade dnl - Check for GTK and/or libglade
FOUND_GLIB=yes FOUND_GLIB=no
HAVE_ALSA=no HAVE_ALSA=no
GLIB_VER=2.8 GLIB_VER=2.8
GTK_VER=2.6 GTK_VER=2.6
AC_CHECK_TOOL(HAVE_PKG, pkg-config) AC_CHECK_TOOL(HAVE_PKG, pkg-config)
AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
if test ! "x$HAVE_PKG" = "x" ; then if test ! "x$HAVE_PKG" = "x" ; then
#PKG_CHECK_MODULES(GLIB, PKG_CHECK_MODULES(GLIB,
# glib-2.0 >= $GLIB_VER, glib-2.0 >= $GLIB_VER,
# FOUND_GLIB=yes, FOUND_GLIB=yes,
# FOUND_GLIB=no) FOUND_GLIB=no)
PKG_CHECK_MODULES(GTK, PKG_CHECK_MODULES(GTK,
gtk+-2.0 >= $GTK_VER, gtk+-2.0 >= $GTK_VER,
@ -155,7 +155,7 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [
AC_PATH_PROG(UPDATEDESKTOP, [update-desktop-database]) AC_PATH_PROG(UPDATEDESKTOP, [update-desktop-database])
fi fi
],[ ],[
echo "WARNING: pkg-config is not available therefore gtk, gtk-glade UIs and lua scripting are not available either." AC_MSG_ERROR([pkg-config is required to build desmume])
]) ])
dnl -- force lua disabled dnl -- force lua disabled