mirror of
https://git.yoctoproject.org/poky
synced 2026-02-13 20:23:04 +01:00
4c5caa6764
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1612 311d38ba-8fff-0310-9ca6-ca027cbcb966
59 lines
2.0 KiB
Diff
59 lines
2.0 KiB
Diff
|
|
#
|
|
# Patch managed by http://www.holgerschurig.de/patcher.html
|
|
#
|
|
|
|
--- bluez-utils-2.20/acinclude.m4~dbus.patch
|
|
+++ bluez-utils-2.20/acinclude.m4
|
|
@@ -211,46 +211,15 @@
|
|
])
|
|
|
|
AC_DEFUN([AC_PATH_DBUS], [
|
|
- dbus_prefix=${prefix}
|
|
-
|
|
- AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
|
|
- if (test "${withval}" != "yes"); then
|
|
- dbus_prefix=${withval}
|
|
- fi
|
|
- ])
|
|
-
|
|
- ac_save_CPPFLAGS=$CPPFLAGS
|
|
- ac_save_LDFLAGS=$LDFLAGS
|
|
-
|
|
- DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
|
|
- test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
|
|
- if (test "${prefix}" = "${bluez_prefix}"); then
|
|
- test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
|
|
- else
|
|
- test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
|
|
- test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
|
|
- fi
|
|
+ if pkg-config --exists dbus-1; then
|
|
+ dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
|
|
+ DBUS_LIBS="`pkg-config --libs dbus-1`"
|
|
|
|
CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
|
|
- AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
|
|
-
|
|
- DBUS_LIBS=""
|
|
- if (test "${prefix}" = "${dbus_prefix}"); then
|
|
- test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
|
|
- else
|
|
- test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
|
|
- test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
|
|
- fi
|
|
-
|
|
LDFLAGS="$LDFLAGS $DBUS_LIBS"
|
|
- AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
|
|
- 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.]))
|
|
-
|
|
- CPPFLAGS=$ac_save_CPPFLAGS
|
|
- LDFLAGS=$ac_save_LDFLAGS
|
|
-
|
|
AC_SUBST(DBUS_CFLAGS)
|
|
AC_SUBST(DBUS_LIBS)
|
|
+ fi
|
|
])
|
|
|
|
AC_DEFUN([AC_ARG_BLUEZ], [
|