few fixes courtesy of ingo saitz

git-svn-id: http://svn.xiph.org/trunk/ao@967 0101bb08-14d6-0310-b084-bc0e0c8e3800

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

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

src/audio_out.c

@@ -130,6 +130,7 @@ void ao_initialize(void)
 						if (plugin) {
 							driver->next = plugin;
 							plugin->next = NULL;
+							driver = driver->next;
 						}
 					}
 				}

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