diff options
| -rwxr-xr-x | bootstrap-configure | 2 | ||||
| -rw-r--r-- | cups/Makefile.am | 3 | ||||
| -rw-r--r-- | cups/main.c | 7 |
3 files changed, 8 insertions, 4 deletions
diff --git a/bootstrap-configure b/bootstrap-configure index 5ba74487..7b07fe1b 100755 --- a/bootstrap-configure +++ b/bootstrap-configure @@ -26,7 +26,7 @@ fi --enable-pand \ --enable-dund \ --enable-test \ - --disable-cups \ + --enable-cups \ --disable-manpages \ --disable-configfiles \ --disable-initscripts \ diff --git a/cups/Makefile.am b/cups/Makefile.am index f01665ee..70a8ba82 100644 --- a/cups/Makefile.am +++ b/cups/Makefile.am @@ -6,8 +6,7 @@ cups_PROGRAMS = bluetooth bluetooth_SOURCES = main.c cups.h sdp.c spp.c hcrp.c -bluetooth_LDADD = $(top_builddir)/common/libhelper.a \ - @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ +bluetooth_LDADD = @GDBUS_LIBS@ @GLIB_LIBS@ @DBUS_LIBS@ @BLUEZ_LIBS@ endif AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ diff --git a/cups/main.c b/cups/main.c index 001d6788..15517f61 100644 --- a/cups/main.c +++ b/cups/main.c @@ -41,7 +41,6 @@ #include <gdbus.h> #include "cups.h" -#include "sdp-xml.h" extern int sdp_search_spp(sdp_session_t *sdp, uint8_t *channel); extern int sdp_search_hcrp(sdp_session_t *sdp, unsigned short *ctrl_psm, unsigned short *data_psm); @@ -63,6 +62,11 @@ static DBusConnection *conn = NULL; #define ATTRID_1284ID 0x0300 +static sdp_record_t *sdp_xml_parse_record(const char *data, int size) +{ + return NULL; +} + static char *parse_xml_sdp(const char *xml) { sdp_record_t *sdp_record; @@ -72,6 +76,7 @@ static char *parse_xml_sdp(const char *xml) sdp_record = sdp_xml_parse_record(xml, strlen(xml)); if (sdp_record == NULL) return NULL; + for (l = sdp_record->attrlist; l != NULL; l = l->next) { sdp_data_t *data; |