[xiph-cvs] cvs commit: ao/src/plugins/alsa Makefile.am

[Jack Moffitt]

jack        00/11/03 21:29:30

  Modified:    .        ao-config.in configure.in
               src      audio_out.c
               src/plugins/alsa Makefile.am
  Log:
  few fixes courtesy of ingo saitz

Revision  Changes    Path
1.3       +4 -7      ao/ao-config.in

Index: ao-config.in
===================================================================
RCS file: /usr/local/cvsroot/ao/ao-config.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ao-config.in	2000/10/30 03:43:23	1.2
+++ ao-config.in	2000/11/04 05:29:29	1.3
@@ -21,9 +21,6 @@
 ao_include_dir="@includedir@/@PACKAGE@"
 lib_dir="@libdir@"
 
-esd_cflags="@ESD_CFLAGS@"
-esd_libs="@ESD_LIBS@"
-
 plugin_dir="@plugindir@"
 
 usage()
@@ -92,15 +89,15 @@
 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

1.8       +6 -0      ao/configure.in

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/ao/configure.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.in	2000/10/31 17:59:38	1.7
+++ configure.in	2000/11/04 05:29:29	1.8
@@ -22,6 +22,7 @@
 dnl ====================================
 
 AC_PROG_CC
+AC_LIBTOOL_DLOPEN
 AM_PROG_LIBTOOL
 
 dnl ====================================
@@ -124,6 +125,11 @@
 
 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
 

1.6       +1 -0      ao/src/audio_out.c

Index: audio_out.c
===================================================================
RCS file: /usr/local/cvsroot/ao/src/audio_out.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audio_out.c	2000/10/30 04:38:48	1.5
+++ audio_out.c	2000/11/04 05:29:29	1.6
@@ -130,6 +130,7 @@
                                                 if (plugin) {
                                                         driver->next = plugin;
                                                         plugin->next = NULL;
+							driver = driver->next;
                                                 }
                                         }
                                 }

1.2       +1 -0      ao/src/plugins/alsa/Makefile.am

Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/ao/src/plugins/alsa/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	2000/10/30 00:46:42	1.1
+++ Makefile.am	2000/11/04 05:29:30	1.2
@@ -22,6 +22,7 @@
 lib_LTLIBRARIES = $(alsaltlibs)
 
 libalsa_la_LDFLAGS = $(alsaldflags)
+libalsa_la_LIBADD = @ALSA_LIBS@
 libalsa_la_SOURCES = $(alsasources)
 
 EXTRA_DIST = ao_alsa.c

--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.