Update of /cvsroot/alsa/alsa-oss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16922

Modified Files:
        Makefile.am configure.in 
Log Message:
- fixed oss wrapper mixer open bug (missing code)
- added lmixer to test directory
- ported mmap_test to use oss redirector
- don't compile code != libalsatoss with -lasound


Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile.am 9 Feb 2004 12:36:39 -0000       1.7
+++ Makefile.am 12 Feb 2004 17:16:07 -0000      1.8
@@ -4,7 +4,7 @@
 ALSA_DIR =
 endif
 
-SUBDIRS = $(ALSA_DIR) oss-redir
+SUBDIRS = $(ALSA_DIR) oss-redir test
 
 dist-hook:
        echo $(VERSION) >> version

Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/configure.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- configure.in        9 Feb 2004 12:36:39 -0000       1.25
+++ configure.in        12 Feb 2004 17:16:07 -0000      1.26
@@ -21,7 +21,20 @@
 AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes)
 
 if test "$with_aoss" = "yes"; then
+  OLD_CFLAGS=$CFLAGS ; CFLAGS=""
+  OLD_LDFLAGS=$LDFLAGS ; LDFLAGS=""
+  OLD_LIBS=$LIBS ; LIBS=""
   AM_PATH_ALSA(0.9.0)
+  ALSA_CFLAGS=$CFLAGS
+  ALSA_LDFLAGS=$LDFLAGS
+  ALSA_LIBS=$LIBS
+  AC_SUBST(ALSA_CFLAGS)
+  AC_SUBST(ALSA_LDFLAGS)
+  AC_SUBST(ALSA_LIBS)
+  CFLAGS=$OLD_CFLAGS
+  LDFLAGS=$OLD_LDFLAGS
+  LIBS=$OLD_LIBS
 fi
 
-AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile)
+AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile test/Makefile \
+          alsa/testaoss test/testaoss)



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog

Reply via email to