Update of /cvsroot/alsa/alsa-oss In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23254
Modified Files: Makefile.am configure.in Removed Files: alsa-oss.c aoss.1 aoss.in Log Message: - moved aoss code to alsa directory - created oss-redir directory with OSS redirection library (not finished yet) Index: Makefile.am =================================================================== RCS file: /cvsroot/alsa/alsa-oss/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- Makefile.am 2 Mar 2003 20:30:29 -0000 1.6 +++ Makefile.am 9 Feb 2004 12:36:39 -0000 1.7 @@ -1,14 +1,10 @@ -lib_LTLIBRARIES = libaoss.la -bin_SCRIPTS = aoss -man_MANS = aoss.1 -EXTRA_DIST = aoss.1 +if WITH_AOSS +ALSA_DIR = alsa +else +ALSA_DIR = +endif -libaoss_la_SOURCES = alsa-oss.c -libaoss_la_LIBADD = -ldl -lasound - - -clean: - rm -f aoss +SUBDIRS = $(ALSA_DIR) oss-redir dist-hook: echo $(VERSION) >> version Index: configure.in =================================================================== RCS file: /cvsroot/alsa/alsa-oss/configure.in,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- configure.in 26 Jan 2004 19:44:03 -0000 1.24 +++ configure.in 9 Feb 2004 12:36:39 -0000 1.25 @@ -1,4 +1,4 @@ -AC_INIT(alsa-oss.c) +AC_INIT(alsa/alsa-oss.c) AM_INIT_AUTOMAKE(alsa-oss, 1.0.2) AC_PREFIX_DEFAULT(/usr) @@ -7,6 +7,21 @@ AC_PROG_INSTALL AC_PROG_LN_S AM_PROG_LIBTOOL -AM_PATH_ALSA(0.9.0) -AC_OUTPUT(Makefile aoss) +dnl Check for aoss... +AC_MSG_CHECKING(for aoss) +AC_ARG_WITH(aoss, + [ --with-aoss=yes,no OSS -> ALSA emulation library build], + with_aoss="$withval", with_aoss="yes") +if test "$with_aoss" = "yes"; then + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi +AM_CONDITIONAL(WITH_AOSS, test x$with_aoss = xyes) + +if test "$with_aoss" = "yes"; then + AM_PATH_ALSA(0.9.0) +fi + +AC_OUTPUT(Makefile alsa/Makefile alsa/aoss oss-redir/Makefile) --- alsa-oss.c DELETED --- --- aoss.1 DELETED --- --- aoss.in DELETED --- ------------------------------------------------------- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn _______________________________________________ Alsa-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/alsa-cvslog