summaryrefslogtreecommitdiffstats
path: root/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-08 15:30:16 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-08 15:30:16 +0000
commit4c5caa6764150e68775e7d4774e82b5a27e475f8 (patch)
tree5f14cf02be03663e124f04b9a6c548e42a5f57ec /meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
parent81547613652cbcc65dfc1e832e6845f3f167c2be (diff)
downloadpoky-4c5caa6764150e68775e7d4774e82b5a27e475f8.tar.gz
bluez: Move from meta-extras to meta since required by syncml/openobex
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1612 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch')
-rw-r--r--meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch53
1 files changed, 53 insertions, 0 deletions
diff --git a/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch b/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
new file mode 100644
index 0000000000..d8ec946a0b
--- /dev/null
+++ b/meta/packages/bluez/bluez-utils-dbus/dbus-2.24.patch
@@ -0,0 +1,53 @@
1--- bluez-utils-2.24/acinclude.m4.orig 2006-01-12 08:21:38.000000000 +0100
2+++ bluez-utils-2.24/acinclude.m4 2006-01-12 08:23:18.000000000 +0100
3@@ -131,46 +131,15 @@
4 ])
5
6 AC_DEFUN([AC_PATH_DBUS], [
7- dbus_prefix=${prefix}
8-
9- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
10- if (test "${withval}" != "yes"); then
11- dbus_prefix=${withval}
12- fi
13- ])
14-
15- ac_save_CPPFLAGS=$CPPFLAGS
16- ac_save_LDFLAGS=$LDFLAGS
17-
18- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
19- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
20- if (test "${prefix}" = "${bluez_prefix}"); then
21- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
22- else
23- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
24- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
25- fi
26+ if pkg-config --exists dbus-1; then
27+ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
28+ DBUS_LIBS="`pkg-config --libs dbus-1`"
29
30 CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
31- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
32-
33- DBUS_LIBS=""
34- if (test "${prefix}" = "${dbus_prefix}"); then
35- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
36- else
37- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
38- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
39- fi
40-
41 LDFLAGS="$LDFLAGS $DBUS_LIBS"
42- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
43- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, dummy=yes, dbus_found=no)
44-
45- CPPFLAGS=$ac_save_CPPFLAGS
46- LDFLAGS=$ac_save_LDFLAGS
47-
48 AC_SUBST(DBUS_CFLAGS)
49 AC_SUBST(DBUS_LIBS)
50+ fi
51 ])
52
53 AC_DEFUN([AC_PATH_FUSE], [