diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2008-09-29 03:21:35 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2008-09-29 03:21:35 +0200 |
| commit | a8172d36292707dda18a877cce34fa1ece3d241d (patch) | |
| tree | 3b4567159f72b24e53d7be7896fa38969c5f57fa | |
| parent | 4b71a08bdc6d45f24f8908e62ac645880d4a3d88 (diff) | |
The usage of libhal is no longer required
| -rw-r--r-- | acinclude.m4 | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 18 |
3 files changed, 3 insertions, 27 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 02e456fa..45dd9096 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -156,12 +156,6 @@ AC_DEFUN([AC_PATH_USB], [ [Define to 1 if you need the usb_interrupt_read() function.])) ]) -AC_DEFUN([AC_PATH_HAL], [ - PKG_CHECK_MODULES(HAL, hal, hal_found=yes, hal_found=no) - AC_SUBST(HAL_CFLAGS) - AC_SUBST(HAL_LIBS) -]) - AC_DEFUN([AC_PATH_NETLINK], [ PKG_CHECK_MODULES(NETLINK, libnl-1, netlink_found=yes, netlink_found=no) AC_SUBST(NETLINK_CFLAGS) @@ -244,10 +238,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ usb_enable=${enableval} ]) - AC_ARG_ENABLE(hal, AC_HELP_STRING([--enable-hal], [enable HAL support]), [ - hal_enable=${enableval} - ]) - AC_ARG_ENABLE(netlink, AC_HELP_STRING([--enable-netlink], [enable NETLINK support]), [ netlink_enable=${enableval} ]) @@ -342,7 +332,6 @@ AC_DEFUN([AC_ARG_BLUEZ], [ AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes") AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes") - AM_CONDITIONAL(HAL, test "${hal_enable}" = "yes" && test "${hal_found}" = "yes") AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes") AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes") AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes") diff --git a/configure.ac b/configure.ac index 978710db..2aba8412 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,6 @@ AC_PATH_GMODULE AC_PATH_ALSA AC_PATH_GSTREAMER AC_PATH_USB -AC_PATH_HAL AC_PATH_NETLINK AC_PATH_SNDFILE diff --git a/plugins/Makefile.am b/plugins/Makefile.am index e8b6ca0f..e95662ac 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -1,12 +1,6 @@ plugindir = $(libdir)/bluetooth/plugins -if HAL -hal_plugins = hal.la -else -hal_plugins = -endif - if NETLINK netlink_plugins = netlink.la else @@ -19,7 +13,7 @@ else service_plugins = endif -plugin_LTLIBRARIES = $(hal_plugins) $(netlink_plugins) $(service_plugins) +plugin_LTLIBRARIES = hal.la $(netlink_plugins) $(service_plugins) noinst_LTLIBRARIES = echo.la storage.la @@ -27,12 +21,6 @@ echo_la_SOURCES = echo.c storage_la_SOURCES = storage.c -if HAL -hal_la_SOURCES = hal.c - -hal_la_LIBADD = @HAL_LIBS@ -endif - if NETLINK netlink_la_SOURCES = netlink.c @@ -46,8 +34,8 @@ endif AM_LDFLAGS = -module -avoid-version -no-undefined \ -export-symbols-regex bluetooth_plugin_desc -AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@ \ - @NETLINK_CFLAGS@ @HAL_CFLAGS@ +AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ + @GDBUS_CFLAGS@ @NETLINK_CFLAGS@ INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/src |