diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-12 00:37:42 +0000 |
| commit | c97480f11bdfdc3cbb867b8127074bcb6b047024 (patch) | |
| tree | 885dff3c4d9f46567af438af0e266acdc932f281 /sdpd | |
| parent | b6f6c5cf2f85f27b277b891acf0a22c4a068bbbe (diff) | |
Allow compilation against GLib
Diffstat (limited to 'sdpd')
| -rw-r--r-- | sdpd/Makefile.am | 12 | ||||
| -rw-r--r-- | sdpd/main.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/sdpd/Makefile.am b/sdpd/Makefile.am index d29932da..e87b03a9 100644 --- a/sdpd/Makefile.am +++ b/sdpd/Makefile.am @@ -1,4 +1,12 @@ +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 cstate.c request.c service.c servicedb.c @@ -7,9 +15,9 @@ sbin_PROGRAMS = sdpd sdpd_SOURCES = main.c -sdpd_LDADD = @BLUEZ_LIBS@ libsdpserver.a $(top_builddir)/common/libhelper.a +sdpd_LDADD = $(glib_ldadd) @BLUEZ_LIBS@ libsdpserver.a $(top_builddir)/common/libhelper.a -AM_CFLAGS = @BLUEZ_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ $(glib_cflags) INCLUDES = -I$(top_srcdir)/common diff --git a/sdpd/main.c b/sdpd/main.c index e64d805b..ab258e93 100644 --- a/sdpd/main.c +++ b/sdpd/main.c @@ -500,7 +500,7 @@ int main(int argc, char *argv[]) } /* Create event loop */ - event_loop = g_main_new(FALSE); + event_loop = g_main_loop_new(NULL, FALSE); l2cap_io = g_io_channel_unix_new(l2cap_sock); g_io_channel_set_close_on_unref(l2cap_io, TRUE); @@ -517,7 +517,7 @@ int main(int argc, char *argv[]) sdp_svcdb_reset(); - g_main_unref(event_loop); + g_main_loop_unref(event_loop); g_io_channel_unref(unix_io); |