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:
parent
dd0286c96c
commit
481642bc65
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue