diff options
Diffstat (limited to 'meta-extras/packages/bluez/bluez-utils-dbus/dbus.patch')
-rw-r--r-- | meta-extras/packages/bluez/bluez-utils-dbus/dbus.patch | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/meta-extras/packages/bluez/bluez-utils-dbus/dbus.patch b/meta-extras/packages/bluez/bluez-utils-dbus/dbus.patch deleted file mode 100644 index c5ab129469..0000000000 --- a/meta-extras/packages/bluez/bluez-utils-dbus/dbus.patch +++ /dev/null | |||
@@ -1,58 +0,0 @@ | |||
1 | |||
2 | # | ||
3 | # Patch managed by http://www.holgerschurig.de/patcher.html | ||
4 | # | ||
5 | |||
6 | --- bluez-utils-2.20/acinclude.m4~dbus.patch | ||
7 | +++ bluez-utils-2.20/acinclude.m4 | ||
8 | @@ -211,46 +211,15 @@ | ||
9 | ]) | ||
10 | |||
11 | AC_DEFUN([AC_PATH_DBUS], [ | ||
12 | - dbus_prefix=${prefix} | ||
13 | - | ||
14 | - AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [ | ||
15 | - if (test "${withval}" != "yes"); then | ||
16 | - dbus_prefix=${withval} | ||
17 | - fi | ||
18 | - ]) | ||
19 | - | ||
20 | - ac_save_CPPFLAGS=$CPPFLAGS | ||
21 | - ac_save_LDFLAGS=$LDFLAGS | ||
22 | - | ||
23 | - DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE" | ||
24 | - test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0" | ||
25 | - if (test "${prefix}" = "${bluez_prefix}"); then | ||
26 | - test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include" | ||
27 | - else | ||
28 | - test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include" | ||
29 | - test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include" | ||
30 | - fi | ||
31 | + if pkg-config --exists dbus-1; then | ||
32 | + dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE" | ||
33 | + DBUS_LIBS="`pkg-config --libs dbus-1`" | ||
34 | |||
35 | CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS" | ||
36 | - AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no) | ||
37 | - | ||
38 | - DBUS_LIBS="" | ||
39 | - if (test "${prefix}" = "${dbus_prefix}"); then | ||
40 | - test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}" | ||
41 | - else | ||
42 | - test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64" | ||
43 | - test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib" | ||
44 | - fi | ||
45 | - | ||
46 | LDFLAGS="$LDFLAGS $DBUS_LIBS" | ||
47 | - AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no) | ||
48 | - AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, AC_DEFINE(HAVE_DBUS_MESSAGE_ITER_GET_BASIC, 1, [Define to 1 if you have the dbus_message_iter_get_basic() function.])) | ||
49 | - | ||
50 | - CPPFLAGS=$ac_save_CPPFLAGS | ||
51 | - LDFLAGS=$ac_save_LDFLAGS | ||
52 | - | ||
53 | AC_SUBST(DBUS_CFLAGS) | ||
54 | AC_SUBST(DBUS_LIBS) | ||
55 | + fi | ||
56 | ]) | ||
57 | |||
58 | AC_DEFUN([AC_ARG_BLUEZ], [ | ||