From 9bbfbb1ce314578f18efe73b2cd74e877eb999fb Mon Sep 17 00:00:00 2001 From: Petri Latvala Date: Thu, 21 Jun 2018 14:06:24 +0300 Subject: Make GLib mandatory GLib was originally made optional for Android builds, and Android support was dropped a while ago due to lack of use and maintenance. Building without GLib was broken without bug reports anyway. Signed-off-by: Petri Latvala Cc: Daniel Vetter Cc: Arkadiusz Hiler Reviewed-by: Daniel Vetter --- configure.ac | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2f6bc70e..1ee4e90e 100644 --- a/configure.ac +++ b/configure.ac @@ -177,10 +177,7 @@ PKG_CHECK_MODULES(XRANDR, xrandr >= 1.3, AC_DEFINE(HAVE_XRANDR, 1, [Have libXran # for testdisplay PKG_CHECK_MODULES(CAIRO, [cairo >= 1.12.0]) PKG_CHECK_MODULES(LIBUDEV, [libudev]) -PKG_CHECK_MODULES(GLIB, [glib-2.0], [glib=yes], [glib=no]) -if test x"$glib" = xyes; then - AC_DEFINE(HAVE_GLIB,1,[Enable glib support]) -fi +PKG_CHECK_MODULES(GLIB, [glib-2.0]) PKG_CHECK_MODULES(GSL, [gsl], [gsl=yes], [gsl=no]) AM_CONDITIONAL(HAVE_GSL, [test "x$gsl" = xyes]) @@ -206,9 +203,6 @@ if test "x$enable_chamelium" = xyes; then fi PKG_CHECK_MODULES(PIXMAN, pixman-1, [], [AC_MSG_ERROR([Failed to find pixman, required by chamelium.])]) - if test x"$glib" != xyes; then - AC_MSG_ERROR([Failed to find glib, required by chamelium.]) - fi if test x"$gsl" != xyes; then AC_MSG_ERROR([Failed to find gsl, required by chamelium.]) fi -- cgit v1.2.3