diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-07-26 19:08:34 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-07-26 19:08:34 +0200 |
| commit | aae4332886b6de9d6873b447022c836f871b2b55 (patch) | |
| tree | 2d9f8adf3b69169639e17049e49b9fbc0bc24f70 | |
| parent | d6ae1c3f777832f8e32702f81fe64e33a1396928 (diff) | |
Compile against included Bluetooth library
| -rw-r--r-- | acinclude.m4 | 10 | ||||
| -rw-r--r-- | configure.in | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 318b0fa1..d8ff3724 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -72,13 +72,6 @@ AC_DEFUN([AC_INIT_BLUEZ], [ [Directory for the service programs]) ]) -AC_DEFUN([AC_PATH_BLUEZ], [ - PKG_CHECK_MODULES(BLUEZ, bluez, dummy=yes, - AC_MSG_ERROR(Bluetooth library is required)) - AC_SUBST(BLUEZ_CFLAGS) - AC_SUBST(BLUEZ_LIBS) -]) - AC_DEFUN([AC_PATH_DBUS], [ PKG_CHECK_MODULES(DBUS, dbus-1 >= 1.0, dummy=yes, AC_MSG_ERROR(D-Bus library is required)) @@ -305,6 +298,9 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus']) AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la']) + AC_SUBST([BLUEZ_CFLAGS], ['-I$(top_srcdir)/include']) + AC_SUBST([BLUEZ_LIBS], ['$(top_builddir)/lib/libbluetooth.la']) + AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc']) AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la']) diff --git a/configure.in b/configure.in index f7fb1dd2..2ff5e3cf 100644 --- a/configure.in +++ b/configure.in @@ -24,7 +24,6 @@ AC_PROG_LIBTOOL AC_FUNC_PPOLL -AC_PATH_BLUEZ AC_PATH_GLIB AC_PATH_GMODULE AC_PATH_DBUS |