From 8cc5595d9091b484b9a4abe314c0f3ec055e0581 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 20 Jan 2007 05:26:15 +0000
Subject: Make it possible to support an embedded GLib

---
 sdpd/Makefile.am | 14 ++++----------
 sdpd/main.c      |  7 ++++---
 sdpd/server.c    |  3 ++-
 3 files changed, 10 insertions(+), 14 deletions(-)

(limited to 'sdpd')

diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am
index 0a425f74..12740584 100644
--- a/sdpd/Makefile.am
+++ b/sdpd/Makefile.am
@@ -1,12 +1,4 @@
 
-if GLIB
-glib_cflags = @GLIB_CFLAGS@
-glib_ldadd  = @GLIB_LIBS@
-else
-glib_cflags =
-glib_ldadd  =
-endif
-
 noinst_LIBRARIES = libsdpserver.a
 
 libsdpserver_a_SOURCES = sdpd.h server.c cstate.c request.c service.c servicedb.c
@@ -16,10 +8,12 @@ sbin_PROGRAMS = sdpd
 
 sdpd_SOURCES = main.c
 
-sdpd_LDADD = $(glib_ldadd) @BLUEZ_LIBS@ libsdpserver.a $(top_builddir)/common/libhelper.a
+sdpd_LDADD = libsdpserver.a \
+	$(top_builddir)/common/libhelper.a \
+	@GLIB_LIBS@ @BLUEZ_LIBS@
 endif
 
-AM_CFLAGS = @BLUEZ_CFLAGS@ $(glib_cflags)
+AM_CFLAGS = @BLUEZ_CFLAGS@ @GLIB_CFLAGS@
 
 INCLUDES = -I$(top_srcdir)/common
 
diff --git a/sdpd/main.c b/sdpd/main.c
index 1154547b..d29c8c16 100644
--- a/sdpd/main.c
+++ b/sdpd/main.c
@@ -36,7 +36,8 @@
 #include <signal.h>
 #include <sys/stat.h>
 
-#include "glib-ectomy.h"
+#include <glib.h>
+
 #include "logging.h"
 #include "sdpd.h"
 
@@ -44,7 +45,7 @@ static GMainLoop *event_loop;
 
 static void sig_term(int sig)
 {
-	g_main_quit(event_loop);
+	g_main_loop_quit(event_loop);
 }
 
 static void sig_hup(int sig)
@@ -143,7 +144,7 @@ int main(int argc, char *argv[])
 		exit(1);
 	}
 
-	g_main_run(event_loop);
+	g_main_loop_run(event_loop);
 
 	stop_sdp_server();
 
diff --git a/sdpd/server.c b/sdpd/server.c
index 65d36996..c5458aac 100644
--- a/sdpd/server.c
+++ b/sdpd/server.c
@@ -42,7 +42,8 @@
 #include <sys/un.h>
 #include <netinet/in.h>
 
-#include "glib-ectomy.h"
+#include <glib.h>
+
 #include "logging.h"
 #include "sdpd.h"
 
-- 
cgit