diff options
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | acinclude.m4 | 6 | ||||
| -rw-r--r-- | alsa/Makefile.am | 17 | ||||
| -rw-r--r-- | alsa/pcm_a2dp.c | 0 | ||||
| -rwxr-xr-x | bootstrap | 2 | ||||
| -rw-r--r-- | configure.in | 8 |
6 files changed, 31 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index 0c4d3fe1..ee845b02 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ # $Id$ # -SUBDIRS = hcid tools rfcomm sdpd dund pand hidd cups test scripts pcmcia extra +SUBDIRS = config hcid tools rfcomm sdpd dund pand hidd cups alsa test scripts pcmcia extra MAINTAINERCLEANFILES = Makefile.in \ - aclocal.m4 configure config.h.in \ - missing install-sh mkinstalldirs + aclocal.m4 configure config.h.in config.sub config.guess \ + ltmain.sh missing install-sh mkinstalldirs diff --git a/acinclude.m4 b/acinclude.m4 index 94f665c8..fbadd434 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -137,8 +137,8 @@ AC_DEFUN([AC_PATH_ALSA], [ ALSA_CFLAGS="" test -d "${alsa_prefix}/include" && ALSA_CFLAGS="$ALSA_CFLAGS -I${alsa_prefix}/include" - CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS" - AC_CHECK_HEADER(alsa/version.h, alsa_found=yes, alsa_found=no) + CPPFLAGS="$CPPFLAGS $ALSA_CFLAGS -include alsa/asoundlib.h" + AC_CHECK_HEADER(alsa/pcm_ioplug.h, alsa_found=yes, alsa_found=no) ALSA_LIBS="" if (test "${prefix}" = "${alsa_prefix}"); then @@ -149,7 +149,7 @@ AC_DEFUN([AC_PATH_ALSA], [ fi LDFLAGS="$LDFLAGS $ALSA_LIBS" - AC_CHECK_LIB(asound, snd_ctl_open, ALSA_LIBS="$ALSA_LIBS -lasound", alsa_found=no) + AC_CHECK_LIB(asound, snd_pcm_ioplug_create, ALSA_LIBS="$ALSA_LIBS -lasound", alsa_found=no) CPPFLAGS=$ac_save_CPPFLAGS LDFLAGS=$ac_save_LDFLAGS diff --git a/alsa/Makefile.am b/alsa/Makefile.am new file mode 100644 index 00000000..65a9aa1a --- /dev/null +++ b/alsa/Makefile.am @@ -0,0 +1,17 @@ +# +# $Id$ +# + +if ALSA +alsadir = $(libdir)/alsa-lib + +alsa_LTLIBRARIES = libasound_module_pcm_a2dp.la + +libasound_module_pcm_a2dp_la_SOURCES = pcm_a2dp.c +libasound_module_pcm_a2dp_la_LDFLAGS = -module -avoid-version -export-dynamic +libasound_module_pcm_a2dp_la_LIBADD = @ALSA_LIBS@ @BLUEZ_LIBS@ + +AM_CFLAGS = @ALSA_CFLAGS@ @BLUEZ_CFLAGS@ +endif + +MAINTAINERCLEANFILES = Makefile.in diff --git a/alsa/pcm_a2dp.c b/alsa/pcm_a2dp.c new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/alsa/pcm_a2dp.c @@ -1,2 +1,2 @@ #! /bin/sh -aclocal && autoheader && automake --add-missing --copy --ignore-deps && autoconf +aclocal && autoheader && libtoolize --copy --force && automake --add-missing --copy --ignore-deps && autoconf diff --git a/configure.in b/configure.in index 02044052..602aa3a7 100644 --- a/configure.in +++ b/configure.in @@ -20,6 +20,12 @@ AC_PROG_INSTALL AC_PROG_YACC AM_PROG_LEX +m4_define([_LT_AC_TAGCONFIG], []) +m4_ifdef([AC_LIBTOOL_TAGS], [AC_LIBTOOL_TAGS([])]) + +AC_DISABLE_STATIC +AC_PROG_LIBTOOL + AC_PATH_BLUEZ AC_PATH_OPENOBEX AC_PATH_ALSA @@ -28,4 +34,4 @@ AC_PATH_DBUS AC_ARG_BLUEZ -AC_OUTPUT(Makefile hcid/Makefile tools/Makefile rfcomm/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile test/Makefile scripts/Makefile pcmcia/Makefile extra/Makefile) +AC_OUTPUT(Makefile config/Makefile hcid/Makefile tools/Makefile rfcomm/Makefile sdpd/Makefile dund/Makefile pand/Makefile hidd/Makefile cups/Makefile alsa/Makefile test/Makefile scripts/Makefile pcmcia/Makefile extra/Makefile) |