Update of /cvsroot/alsa/alsa-driver/include
In directory sc8-pr-cvs1:/tmp/cvs-serv1156/include
Modified Files:
.cvsignore adriver.h config.h.in
Added Files:
autoconf-extra.h.in
Log Message:
- fixed --with-isapnp option of configure.
- changed (added) to build / install for 2.6 kernels.
with this change, you cannot run make in the local directory any more
unless you set SND_TOPDIR environment variable. it points to the path
name of the top directory of alsa-driver directory.
--- NEW FILE: autoconf-extra.h.in ---
/*
* external ALSA section by alsa-driver
*/
#undef CONFIG_SND_MODULE
#undef CONFIG_SND_BIT32_EMUL_MODULE
#undef CONFIG_SND_RTCTIMER_MODULE
#undef CONFIG_SND_SEQUENCER_MODULE
#undef CONFIG_SND_SEQ_DUMMY_MODULE
#undef CONFIG_SND_OSSEMUL
#undef CONFIG_SND_MIXER_OSS_MODULE
#undef CONFIG_SND_PCM_OSS_MODULE
#undef CONFIG_SND_SEQUENCER_OSS
#undef CONFIG_SND_DEBUG
#undef CONFIG_SND_DEBUG_MEMORY
#undef CONFIG_SND_DEBUG_FULL
#undef CONFIG_SND_DEBUG_DETECT
Index: .cvsignore
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 9 May 2003 08:09:38 -0000 1.9
+++ .cvsignore 10 Nov 2003 17:32:38 -0000 1.10
@@ -7,3 +7,4 @@
pnp.h
linux
asm
+autoconf-extra.h
Index: adriver.h
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/adriver.h,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- adriver.h 30 Oct 2003 11:31:43 -0000 1.61
+++ adriver.h 10 Nov 2003 17:32:38 -0000 1.62
@@ -36,7 +36,7 @@
#define LINUX_2_2
#endif
-#ifdef ALSA_BUILD
+#if defined(ALSA_BUILD) && LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
#if defined(CONFIG_MODVERSIONS) && !defined(__GENKSYMS__) && !defined(__DEPEND__)
#define MODVERSIONS
#include <linux/modversions.h>
@@ -46,7 +46,7 @@
#undef MODVERSIONS
#undef _set_ver
#endif
-#endif /* ALSA_BUILD */
+#endif /* ALSA_BUILD && KERNEL < 2.6.0 */
#include <linux/module.h>
Index: config.h.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/include/config.h.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- config.h.in 6 Oct 2003 10:09:33 -0000 1.23
+++ config.h.in 10 Nov 2003 17:32:38 -0000 1.24
@@ -7,10 +7,10 @@
/* ALSA section */
#undef CONFIG_SND_VERSION
#undef CONFIG_SND_ISA
-#undef CONFIG_SND_SEQUENCER
+#undef CONFIG_SND_SEQUENCER_MODULE
#undef CONFIG_SND_OSSEMUL
-#undef CONFIG_SND_MIXER_OSS
-#undef CONFIG_SND_PCM_OSS
+#undef CONFIG_SND_MIXER_OSS_MODULE
+#undef CONFIG_SND_PCM_OSS_MODULE
#undef CONFIG_SND_SEQUENCER_OSS
#undef CONFIG_SND_VERBOSE_PRINTK
#undef CONFIG_SND_DEBUG
-------------------------------------------------------
This SF.Net email sponsored by: ApacheCon 2003,
16-19 November in Las Vegas. Learn firsthand the latest
developments in Apache, PHP, Perl, XML, Java, MySQL,
WebDAV, and more! http://www.apachecon.com/
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
