diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /bluez-utils | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'bluez-utils')
| -rw-r--r-- | bluez-utils/bluez-utils-2.10/dbus.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/bluez-utils/bluez-utils-2.10/dbus.patch b/bluez-utils/bluez-utils-2.10/dbus.patch index e69de29bb2..b360c4dca2 100644 --- a/bluez-utils/bluez-utils-2.10/dbus.patch +++ b/bluez-utils/bluez-utils-2.10/dbus.patch @@ -0,0 +1,52 @@ +--- bluez-utils-2.10/acinclude.m4.old 2004-10-19 22:34:47.000000000 +0100 ++++ bluez-utils-2.10/acinclude.m4 2004-10-19 22:50:47.000000000 +0100 +@@ -124,45 +124,14 @@ + ]) + + 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_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) +- +- CPPFLAGS=$ac_save_CPPFLAGS +- LDFLAGS=$ac_save_LDFLAGS +- + AC_SUBST(DBUS_CFLAGS) + AC_SUBST(DBUS_LIBS) ++ fi + ]) + + AC_DEFUN([AC_ARG_BLUEZ], [ |