[beast] DRIVERS: moved bse-alsa into Beast

[Tim Janik <timj src gnome org>]

commit 5a69b6b4ebe7401d21fd1ead9a30ce5e4083d9b1
Author: Tim Janik <timj gtk org>
Date:   Thu Apr 7 21:56:38 2011 +0200

    DRIVERS: moved bse-alsa into Beast

 Makefile.am                                 |    2 +-
 configure.in                                |   54 +++++++++++++++++++++++++++
 drivers/Makefile.am                         |   27 +++++++++++++
 drivers/{bse-alsa => }/bsemididevice-alsa.c |    0
 drivers/{bse-alsa => }/bsemididevice-alsa.h |    0
 drivers/{bse-alsa => }/bsepcmdevice-alsa.c  |    0
 drivers/{bse-alsa => }/bsepcmdevice-alsa.h  |    0
 po/POTSCAN                                  |    4 +-
 8 files changed, 84 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4b8fe67..1bbb24c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@
 ## GNU Lesser General Public License version 2 or any later version.
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = . data birnet sfi bse plugins shell beast-gtk launchers library tools po tests doxer docs web
+SUBDIRS = . data birnet sfi bse plugins drivers shell beast-gtk launchers library tools po tests doxer docs web
 
 noinst_DATA =
 
diff --git a/configure.in b/configure.in
index 808fb2b..12a04ae 100644
--- a/configure.in
+++ b/configure.in
@@ -354,6 +354,58 @@ AC_DEFUN([AC_BSE_REQUIREMENTS],
     bseuserdatadir='~/beast'
     AC_SUBST(bseuserdatadir)
 ])
+AC_DEFUN([AC_ASOUND_CHECK],
+[
+    saved_cflags="$CFLAGS"
+    saved_cxxflags="$CXXFLAGS"
+    saved_ldflags="$LDFLAGS"
+    dnl # automatically search for libasound under the BSE prefix
+    CFLAGS="$CFLAGS $BSE_CFLAGS"
+    CXXFLAGS="$CFLAGS $BSE_CFLAGS"
+    LDFLAGS="$LDFLAGS $BSE_LIBS"
+    AC_LANG_SAVE
+
+    dnl --- find asoundlib.h ---
+    found_asoundlibh=0
+    AC_CHECK_HEADERS(alsa/asoundlib.h, found_asoundlibh=1)
+    if test $found_asoundlibh = 0 ; then
+	AC_MSG_ERROR([failed to detect asoundlib.h, ALSA not present?])
+    fi
+
+    dnl --- check for ALSA >= 1.0.5 ---
+    AC_MSG_CHECKING([for ALSA with version >= 1.0])
+    found_alsa1=0
+    AC_TRY_COMPILE([#include <alsa/asoundlib.h>],[
+            #if SND_LIB_MAJOR >= 1
+		/* ALSA >= 1.0 present */
+	    #else
+		#error ALSA version <= 1.0
+	    #endif
+    ], [ found_alsa1=1; AC_MSG_RESULT(present); ], [ AC_MSG_RESULT(not present); ])
+    if test $found_alsa1 = 0; then
+	AC_MSG_ERROR([ALSA version 1.0.5 is required to build this package])
+    fi
+
+    dnl --- check for -lasound ---
+    found_libasound=0
+    dnl snd_asoundlib_version() was introduced in ALSA 1.0.5
+    cflags=$CFLAGS
+    ldflags=$LDFLAGS
+    CFLAGS=""
+    LDFLAGS=""
+    AC_CHECK_LIB(asound, snd_asoundlib_version, ALSA_LIBS="-lasound"; found_libasound=1)
+    CFLAGS="$cflags"
+    LDFLAGS="$ldflags"
+    if test $found_libasound = 0; then
+	AC_MSG_ERROR([ALSA version 1.0.5 is required to build this package])
+    fi
+    AC_SUBST(ALSA_LIBS)
+
+    AC_LANG_RESTORE
+    CFLAGS="$saved_cflags"
+    CXXFLAGS="$saved_cxxflags"
+    LDFLAGS="$saved_ldflags"
+])
 AC_DEFUN([AC_BSESCM_REQUIREMENTS],
 [
     BSESCM_CFLAGS="$BSE_CFLAGS"
@@ -576,6 +628,7 @@ AC_BIRNET_REQUIREMENTS
 AC_I18N_REQUIREMENTS
 AC_SFI_REQUIREMENTS
 AC_BSE_REQUIREMENTS
+AC_ASOUND_CHECK
 AC_BSESCM_REQUIREMENTS
 AC_BSE_SNDDEV_CHECK
 AC_GXK_REQUIREMENTS
@@ -615,6 +668,7 @@ bse/tests/Makefile
 plugins/Makefile
 plugins/icons/Makefile
 plugins/freeverb/Makefile
+drivers/Makefile
 shell/Makefile
 beast-gtk/Makefile
 beast-gtk/gxk/Makefile
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
new file mode 100644
index 0000000..f12bda8
--- /dev/null
+++ b/drivers/Makefile.am
@@ -0,0 +1,27 @@
+# BSE-Plugins - Bedevilled Sound Engine dynamic Plugins
+# Copyright (C) 2004-2011 Tim Janik
+#
+## GNU Lesser General Public License version 2 or any later version.
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES += -I$(top_srcdir) -I. $(BSE_CFLAGS)
+DEFS = $(strip -DG_LOG_DOMAIN=\"BSE-ALSA\")
+
+# Plugin bsedevice-alsa
+driversdir          = $(bsedriverdir)
+drivers_LTLIBRARIES = bsepcmdevice-alsa.la bsemididevice-alsa.la
+drivers_ldflags     = -avoid-version
+drivers_libs        = $(top_builddir)/bse/libbse.la $(BSE_LIBS)
+EXTRA_DIST=
+
+# Plugin bsepcmdevice-alsa
+bsepcmdevice_alsa_la_SOURCES = bsepcmdevice-alsa.c
+bsepcmdevice_alsa_la_LDFLAGS = -module $(drivers_ldflags)
+bsepcmdevice_alsa_la_LIBADD  = $(drivers_libs) $(ALSA_LIBS)
+EXTRA_DIST                  += bsepcmdevice-alsa.h
+
+# Plugin bsemididevice-alsa
+bsemididevice_alsa_la_SOURCES = bsemididevice-alsa.c
+bsemididevice_alsa_la_LDFLAGS = -module $(drivers_ldflags)
+bsemididevice_alsa_la_LIBADD  = $(drivers_libs) $(ALSA_LIBS)
+EXTRA_DIST                   += bsemididevice-alsa.h
diff --git a/drivers/bse-alsa/bsemididevice-alsa.c b/drivers/bsemididevice-alsa.c
similarity index 100%
rename from drivers/bse-alsa/bsemididevice-alsa.c
rename to drivers/bsemididevice-alsa.c
diff --git a/drivers/bse-alsa/bsemididevice-alsa.h b/drivers/bsemididevice-alsa.h
similarity index 100%
rename from drivers/bse-alsa/bsemididevice-alsa.h
rename to drivers/bsemididevice-alsa.h
diff --git a/drivers/bse-alsa/bsepcmdevice-alsa.c b/drivers/bsepcmdevice-alsa.c
similarity index 100%
rename from drivers/bse-alsa/bsepcmdevice-alsa.c
rename to drivers/bsepcmdevice-alsa.c
diff --git a/drivers/bse-alsa/bsepcmdevice-alsa.h b/drivers/bsepcmdevice-alsa.h
similarity index 100%
rename from drivers/bse-alsa/bsepcmdevice-alsa.h
rename to drivers/bsepcmdevice-alsa.h
diff --git a/po/POTSCAN b/po/POTSCAN
index a921515..ec63a2f 100644
--- a/po/POTSCAN
+++ b/po/POTSCAN
@@ -106,8 +106,8 @@ bse/bsewaveosc.c
 data/beast.desktop.in
 data/beast.xml.in
 data/bse.keys.in
-drivers/bse-alsa/bsemididevice-alsa.c
-drivers/bse-alsa/bsepcmdevice-alsa.c
+drivers/bsepcmdevice-alsa.c
+drivers/bsemididevice-alsa.c
 drivers/bse-portaudio/bsepcmdevice-portaudio.cc
 library/scripts/mixer-splitup-by-track.scm
 library/scripts/modules2grid.scm