From d435dcdca46fd239cb4d25fa3c9db5c589a6a553 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Thu, 4 Dec 2014 23:55:11 +0100
Subject: [PATCH] configure.ac: make GLib optional by default

Only very few (minor) features still depend on GLib.
---
 INSTALL      |  3 ---
 NEWS         |  1 +
 configure.ac | 16 +++++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/INSTALL b/INSTALL
index 29a23d361..29142a891 100644
--- a/INSTALL
+++ b/INSTALL
@@ -18,9 +18,6 @@ Any other C++11 compliant compiler should also work.
 
 Boost 1.46 - http://www.boost.org/
 
-GLib 2.28 - http://www.gtk.org/
-General-purpose utility library.
-
 
 Optional Output Dependencies
 ----------------------------
diff --git a/NEWS b/NEWS
index 31a034763..bacaf951a 100644
--- a/NEWS
+++ b/NEWS
@@ -10,6 +10,7 @@ ver 0.20 (not yet released)
 * mixer
   - null: new plugin
 * reset song priority on playback
+* remove dependency on GLib
 
 ver 0.19.5 (2014/11/26)
 * input
diff --git a/configure.ac b/configure.ac
index 19af3c2dc..2291b9479 100644
--- a/configure.ac
+++ b/configure.ac
@@ -518,13 +518,18 @@ AM_CONDITIONAL(HAVE_ICU, test x$enable_icu = xyes)
 
 AC_ARG_ENABLE(glib,
 	AS_HELP_STRING([--enable-glib],
-		[enable GLib usage (default: enabled)]),,
-	enable_glib=yes)
+		[enable GLib (default: auto)]),,
+	enable_glib=auto)
+
+if test x$enable_glib != xno; then
+	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],
+		[found_glib=yes],
+		[found_glib=no])
+
+	MPD_AUTO_RESULT([glib], [Glib], [GLib not found])
+fi
 
 if test x$enable_glib = xyes; then
-	PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28 gthread-2.0],,
-		[AC_MSG_ERROR([GLib 2.28 is required])])
-
 	if test x$GCC = xyes; then
 		# suppress warnings in the GLib headers
 		GLIB_CFLAGS=`echo $GLIB_CFLAGS |sed -e 's,-I/,-isystem /,g'`
@@ -532,6 +537,7 @@ if test x$enable_glib = xyes; then
 
 	AC_DEFINE(HAVE_GLIB, 1, [Define if GLib is used])
 fi
+
 AM_CONDITIONAL(HAVE_GLIB, test x$enable_glib = xyes)
 
 dnl ---------------------------------------------------------------------------