From 481642bc6516f079ff9404f848af63143465df91 Mon Sep 17 00:00:00 2001 From: riccardom Date: Sat, 10 Oct 2009 20:32:25 +0000 Subject: [PATCH] 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. --- desmume/configure.ac | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/desmume/configure.ac b/desmume/configure.ac index 828d26b1e..7bd10d6e4 100644 --- a/desmume/configure.ac +++ b/desmume/configure.ac @@ -88,17 +88,17 @@ if test "x$osmesa" = "xyes" ; then fi dnl - Check for GTK and/or libglade -FOUND_GLIB=yes +FOUND_GLIB=no HAVE_ALSA=no GLIB_VER=2.8 GTK_VER=2.6 AC_CHECK_TOOL(HAVE_PKG, pkg-config) AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ if test ! "x$HAVE_PKG" = "x" ; then - #PKG_CHECK_MODULES(GLIB, - # glib-2.0 >= $GLIB_VER, - # FOUND_GLIB=yes, - # FOUND_GLIB=no) + PKG_CHECK_MODULES(GLIB, + glib-2.0 >= $GLIB_VER, + FOUND_GLIB=yes, + FOUND_GLIB=no) PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_VER, @@ -155,7 +155,7 @@ AC_PROVIDE_IFELSE([PKG_PROG_PKG_CONFIG], [ AC_PATH_PROG(UPDATEDESKTOP, [update-desktop-database]) 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