From 95f6c710e788fea4c666a7885918bd085b1d59e2 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@xiph.org>
Date: Sat, 4 Nov 2000 05:29:30 +0000
Subject: [PATCH] few fixes courtesy of ingo saitz
git-svn-id: http://svn.xiph.org/trunk/ao@967 0101bb08-14d6-0310-b084-bc0e0c8e3800
---
ao-config.in | 11 ++++-------
configure.in | 6 ++++++
src/audio_out.c | 1 +
src/plugins/alsa/Makefile.am | 1 +
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ao-config.in b/ao-config.in
index f412054..5a6c067 100644
--- a/ao-config.in
+++ b/ao-config.in
@@ -21,9 +21,6 @@ include_dir="@includedir@"
ao_include_dir="@includedir@/@PACKAGE@"
lib_dir="@libdir@"
-esd_cflags="@ESD_CFLAGS@"
-esd_libs="@ESD_LIBS@"
-
plugin_dir="@plugindir@"
usage()
@@ -92,15 +89,15 @@ if test "$echo_exec_prefix" = "yes"; then
fi
if test "$include_dir" != "/usr/include"; then
- cflags="-I$include_dir $esd_cflags"
+ cflags="-I$include_dir"
else
- cflags="$esd_cflags"
+ cflags=""
fi
if test "$lib_dir" != "/usr/lib"; then
- libs="-L$lib_dir $esd_libs -lao -ldl"
+ libs="-L$lib_dir -lao -ldl"
else
- libs="$esd_libs -lao -ldl"
+ libs="-lao -ldl"
fi
if test "$echo_cflags" = "yes"; then
diff --git a/configure.in b/configure.in
index aadb5c0..709ffe3 100644
--- a/configure.in
+++ b/configure.in
@@ -22,6 +22,7 @@ dnl Check for programs
dnl ====================================
AC_PROG_CC
+AC_LIBTOOL_DLOPEN
AM_PROG_LIBTOOL
dnl ====================================
@@ -125,6 +126,11 @@ dnl Check for ALSA
AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
AM_CONDITIONAL(HAVE_ALSA,test "x$have_alsa" = xyes)
+if test "x$have_alsa" = xyes; then
+ ALSA_LIBS="-lasound"
+ AC_SUBST(ALSA_LIBS)
+fi
+
dnl Check for IRIX
case $host in
diff --git a/src/audio_out.c b/src/audio_out.c
index 3f37ae1..09f408e 100644
--- a/src/audio_out.c
+++ b/src/audio_out.c
@@ -130,6 +130,7 @@ void ao_initialize(void)
if (plugin) {
driver->next = plugin;
plugin->next = NULL;
+ driver = driver->next;
}
}
}
diff --git a/src/plugins/alsa/Makefile.am b/src/plugins/alsa/Makefile.am
index 5485bf8..0a6b8ac 100644
--- a/src/plugins/alsa/Makefile.am
+++ b/src/plugins/alsa/Makefile.am
@@ -22,6 +22,7 @@ libdir = $(plugindir)
lib_LTLIBRARIES = $(alsaltlibs)
libalsa_la_LDFLAGS = $(alsaldflags)
+libalsa_la_LIBADD = @ALSA_LIBS@
libalsa_la_SOURCES = $(alsasources)
EXTRA_DIST = ao_alsa.c
--
GitLab