Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11615
Modified Files:
Makefile Makefile.conf.in configure.in
Log Message:
- fixed the definition of OSS and debug configs.
- clean up Makefile.conf - most configs are found in toplevel.config.
- define MAINSRCDIR if no config is found.
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- Makefile 3 Mar 2004 20:19:40 -0000 1.103
+++ Makefile 5 Mar 2004 11:49:44 -0000 1.104
@@ -14,6 +14,7 @@
ifeq (Makefile.conf,$(wildcard Makefile.conf))
include Makefile.conf
+include toplevel.config
else
.PHONY: dummy1
dummy1:
@@ -21,6 +22,7 @@
@echo
@echo "Please, run the configure script as first..."
@echo
+MAINSRCDIR := $(shell /bin/pwd)
endif
SND_TOPDIR = $(MAINSRCDIR)
Index: Makefile.conf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- Makefile.conf.in 2 Mar 2004 16:52:21 -0000 1.61
+++ Makefile.conf.in 5 Mar 2004 11:49:44 -0000 1.62
@@ -41,43 +41,9 @@
CONFIG_SND_VERSION = @CONFIG_SND_VERSION@
CONFIG_SND_KERNELDIR = @CONFIG_SND_KERNELDIR@
CONFIG_MODULES = y
-CONFIG_SND = m
CONFIG_SND_MVERSION = @CONFIG_SND_MVERSION@
-CONFIG_PCI = @CONFIG_PCI@
-CONFIG_ISA = @CONFIG_ISA@
CONFIG_ISAPNP_KERNEL = @CONFIG_ISAPNP_KERNEL@
CONFIG_PNP_KERNEL = @CONFIG_PNP_KERNEL@
-CONFIG_ISAPNP = @CONFIG_ISAPNP@
-CONFIG_PNP = @CONFIG_PNP@
-CONFIG_SGI = @CONFIG_SGI@
-CONFIG_L3 = @CONFIG_L3@
-CONFIG_X86 = @CONFIG_X86@
-CONFIG_ALPHA = @CONFIG_ALPHA@
-CONFIG_ARM = @CONFIG_ARM@
-CONFIG_PPC = @CONFIG_PPC@
-CONFIG_PARISC = @CONFIG_PARISC@
-CONFIG_X86_PC9800 = @CONFIG_X86_PC9800@
-CONFIG_PCMCIA = @CONFIG_PCMCIA@
-CONFIG_SND_SEQUENCER = @CONFIG_SND_SEQUENCER@
-CONFIG_SND_SEQ_DUMMY = @CONFIG_SND_SEQUENCER@
-CONFIG_SND_OSSEMUL = @CONFIG_SND_OSSEMUL@
-ifeq (y,$(CONFIG_SND_OSSEMUL))
- CONFIG_SND_MIXER_OSS = m
- CONFIG_SND_PCM_OSS = m
- ifeq (m,$(CONFIG_SND_SEQUENCER))
- CONFIG_SND_SEQUENCER_OSS = y
- endif
-else
- CONFIG_SND_MIXER_OSS =
- CONFIG_SND_PCM_OSS =
- CONFIG_SND_SEQUENCER_OSS =
-endif
-CONFIG_SND_RTCTIMER = @CONFIG_SND_RTCTIMER@
-CONFIG_RTC = @CONFIG_RTC@
-CONFIG_USB = @CONFIG_USB@
-CONFIG_SND_BIT32_EMUL = @CONFIG_SND_BIT32_EMUL@
-CONFIG_VIDEO_DEV = @CONFIG_VIDEO_DEV@
-CONFIG_ACPI_BUS = @CONFIG_ACPI_BUS@
ifndef NEW_KBUILD
INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@ @KERNEL_INC@
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -r1.234 -r1.235
--- configure.in 4 Mar 2004 18:29:56 -0000 1.234
+++ configure.in 5 Mar 2004 11:49:44 -0000 1.235
@@ -548,6 +548,7 @@
verbose_printk="$enableval", verbose_printk="yes")
case "$verbose_printk" in
yes)
+ CONFIG_SND_VERBOSE_PRINTK=y
AC_DEFINE(CONFIG_SND_VERBOSE_PRINTK)
AC_MSG_RESULT(on)
;;
@@ -560,29 +561,28 @@
dnl Debug level
AC_MSG_CHECKING(for debug level)
AC_ARG_WITH(debug,
- [ --with-debug=level give the debug level (none,basic,memory,full,detect)],
+ [ --with-debug=level give the debug level (none,basic,full,detect)],
debug="$withval", debug="none")
case "$debug" in
basic)
AC_MSG_RESULT(basic)
+ CONFIG_SND_DEBUG=y
AC_DEFINE(CONFIG_SND_DEBUG)
;;
- memory)
- AC_MSG_RESULT(memory)
- AC_DEFINE(CONFIG_SND_DEBUG)
- AC_DEFINE(CONFIG_SND_DEBUG_MEMORY)
- ;;
- full)
+ memory|full)
AC_MSG_RESULT(full)
+ CONFIG_SND_DEBUG=y
AC_DEFINE(CONFIG_SND_DEBUG)
+ CONFIG_SND_DEBUG_MEMORY=y
AC_DEFINE(CONFIG_SND_DEBUG_MEMORY)
- AC_DEFINE(CONFIG_SND_DEBUG_FULL)
- ;;
+ ;;
detect)
AC_MSG_RESULT(detect)
+ CONFIG_SND_DEBUG=y
AC_DEFINE(CONFIG_SND_DEBUG)
+ CONFIG_SND_DEBUG_MEMORY=y
AC_DEFINE(CONFIG_SND_DEBUG_MEMORY)
- AC_DEFINE(CONFIG_SND_DEBUG_FULL)
+ CONFIG_SND_DEBUG_DETECT=y
AC_DEFINE(CONFIG_SND_DEBUG_DETECT)
;;
*)
@@ -965,9 +965,11 @@
fi
AC_SUBST(msmp)
-dnl Check for video device support...
+dnl Check for video device support... (2.2 kernels excluded due to API
incompatibility)
+if test $kpatchlevel -gt 2; then
CHECK_KERNEL_CONFIG(CONFIG_VIDEO_DEV, [Video device support in kernel])
AC_SUBST(CONFIG_VIDEO_DEV)
+fi
dnl Check for ISA PnP driver in kernel...
AC_MSG_CHECKING(for ISA PnP driver in kernel)
@@ -1402,7 +1404,6 @@
if test "$ossemul" = "yes"; then
CONFIG_SND_OSSEMUL="y"
fi
-AC_SUBST(CONFIG_SND_OSSEMUL)
if test "$CONFIG_SND_OSSEMUL" = "y"; then
AC_DEFINE(CONFIG_SND_OSSEMUL)
AC_DEFINE(CONFIG_SND_MIXER_OSS_MODULE)
@@ -1496,6 +1497,18 @@
dnl Check for which cards to compile driver for...
ALSA_TOPLEVEL_SELECT
+dnl OSS emulations
+if test "$CONFIG_SND_OSSEMUL" = "y"; then
+ CONFIG_SND_MIXER_OSS="$CONFIG_SND"
+ CONFIG_SND_PCM_OSS="$CONFIG_SND_PCM"
+ if test -n "$CONFIG_SND_SEQUENCER"; then
+ CONFIG_SND_SEQUENCER_OSS="y"
+ fi
+fi
+
+dnl Output all stuffs
+ALSA_TOPLEVEL_OUTPUT
+
dnl Some late substitutes...
c_opts="$c_opts -DLINUX"
m_opts=""
-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
