1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
--- bluez-utils-2.18/acinclude.m4.old 2005-07-11 12:15:00.000000000 +0200
+++ bluez-utils-2.18/acinclude.m4 2005-07-11 12:18:48.000000000 +0200
@@ -211,48 +211,17 @@
])
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_pending_call_steal_reply, AC_DEFINE(HAVE_DBUS_PENDING_CALL_STEAL_REPLY, 1, [Define to 1 if you have the dbus_pending_call_steal_reply() function.]))
- 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.]))
- AC_CHECK_LIB(dbus-1, dbus_message_append_args, AC_DEFINE(HAVE_DBUS_MESSAGE_APPEND_ARGS, 1, [Define to 1 if you have the dbus_message_append_args() function.]))
-
- CPPFLAGS=$ac_save_CPPFLAGS
- LDFLAGS=$ac_save_LDFLAGS
AC_SUBST(DBUS_CFLAGS)
AC_SUBST(DBUS_LIBS)
+ fi
])
AC_DEFUN([AC_ARG_BLUEZ], [
|
