aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-15 19:35:04 +0200
committerMax Kellermann <max@duempel.org>2008-10-15 19:35:04 +0200
commite89599eaad23990973efd43f01cb802917a31cff (patch)
tree29eb594f37b2d6c6de0f912b46e290a9813f4b72
parent2a47e90cf5c6585e5b0a8f4d0f2b2a27a891a8d9 (diff)
downloadmpd-e89599eaad23990973efd43f01cb802917a31cff.tar.gz
mpd-e89599eaad23990973efd43f01cb802917a31cff.tar.xz
mpd-e89599eaad23990973efd43f01cb802917a31cff.zip
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?
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am5
2 files changed, 6 insertions, 1 deletions
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