From e89599eaad23990973efd43f01cb802917a31cff Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 15 Oct 2008 19:35:04 +0200
Subject: use GLib

GLib is a nice and portable utility library.  We are going to use it
from now on, and eliminate a lot of duplicated code from MPD.  Why
invent the wheel again and again?
---
 configure.ac    | 2 ++
 src/Makefile.am | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 354bfccbe..75d7b9d8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,6 +138,8 @@ AC_CHECK_LIB(nsl,gethostbyname,MPD_LIBS="$MPD_LIBS -lnsl",)
 AC_CHECK_LIB(m,exp,MPD_LIBS="$MPD_LIBS -lm",)
 AC_CHECK_FUNCS(setenv)
 
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.4],,
+		  [AC_MSG_ERROR([glib-2.4 is required])])
 
 dnl doesn't work for systems that don't have CODESET like OpenBSD
 dnl AC_CHECK_HEADER(langinfo.h,[enable_langinfo=yes;AC_DEFINE(HAVE_LANGINFO,1,[Define if nl_langinfo.h is present])],enable_langinfo=no)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6135c41bb..41bc69f05 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,5 @@
+AM_CPPFLAGS = $(GLIB_CFLAGS)
+
 bin_PROGRAMS = mpd
 SUBDIRS = $(MP4FF_SUBDIR)
 
@@ -196,7 +198,8 @@ mpd_SOURCES = \
 
 
 mpd_CFLAGS = $(MPD_CFLAGS)
-mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB)
+mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
+  $(GLIB_LIBS)
 
 DIST_SUBDIRS = mp4ff
 
-- 
cgit v1.2.3