From 8a9eccdaf94dd7f2e587f17cfa32213c7b5dfda1 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sun, 15 Jul 2012 16:41:26 +0200 Subject: [PATCH] build: remove glib dependency We no longer require glib, yeah! Drop the mandatory glib dependency from all build-files. Notice that there is not a single dependency, anymore, except for libc. We still have a not-mentioned pango dependency but this can be replaced with freetype or a static font renderer so we currently do not care. Signed-off-by: David Herrmann --- Makefile.am | 4 +--- configure.ac | 10 +--------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index 167ecfb..2ae0218 100644 --- a/Makefile.am +++ b/Makefile.am @@ -129,13 +129,11 @@ libkmscon_core_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GLES2_CFLAGS) \ $(PANGO_CFLAGS) \ - $(FREETYPE2_CFLAGS) \ - $(GLIB_CFLAGS) + $(FREETYPE2_CFLAGS) libkmscon_core_la_LIBADD = \ $(GLES2_LIBS) \ $(PANGO_LIBS) \ $(FREETYPE2_LIBS) \ - $(GLIB_LIBS) \ -lpthread \ libeloop.la \ libuterm.la diff --git a/configure.ac b/configure.ac index 5ed4b89..655b704 100644 --- a/configure.ac +++ b/configure.ac @@ -52,9 +52,6 @@ GTK_DOC_CHECK([1.14],[--flavour no-tmpl]) # ourself. # -PKG_CHECK_MODULES([GLIB], [glib-2.0], - [have_glib=yes], [have_glib=no]) - PKG_CHECK_MODULES([SYSTEMD], [libsystemd-login], [have_systemd=yes], [have_systemd=no]) @@ -160,12 +157,9 @@ AM_CONDITIONAL([DEBUG], [test x$debug_enabled = xyes]) # # Main dependencies # This checks for all dependencies that are not optional. -# TODO: remove glib dependency # -if test ! x$have_glib = xyes ; then - AC_ERROR([glib-2.0 no found but is required by kmscon]) -fi +# We currently have no mandatory dependencies! # # Systemd dependency @@ -372,8 +366,6 @@ AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) AC_SUBST(XKBCOMMON_CFLAGS) AC_SUBST(XKBCOMMON_LIBS) -AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_LIBS) AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) AC_SUBST(PANGO_CFLAGS)