Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26597
Modified Files:
Makefile.conf.in configure.in
Log Message:
Added module for TEA575x radio tuners used in cheap FM801 based soundcards from Media
Forte.
Index: Makefile.conf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- Makefile.conf.in 26 Jan 2004 14:02:35 -0000 1.58
+++ Makefile.conf.in 28 Jan 2004 18:43:14 -0000 1.59
@@ -76,6 +76,7 @@
CONFIG_RTC = @CONFIG_RTC@
CONFIG_USB = @CONFIG_USB@
CONFIG_SND_BIT32_EMUL = @CONFIG_SND_BIT32_EMUL@
+CONFIG_VIDEO_DEV = @CONFIG_VIDEO_DEV@
ifndef NEW_KBUILD
INCLUDE = -I$(TOPDIR)/include @EXTRA_INCLUDES@
-I$(CONFIG_SND_KERNELDIR)/include
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- configure.in 26 Jan 2004 19:27:57 -0000 1.216
+++ configure.in 28 Jan 2004 18:43:15 -0000 1.217
@@ -337,8 +337,8 @@
])
dnl Check kernel configurations
-AC_DEFUN([CHECK_KERNEL_CONFIG], [
- boolvar=$1
+AC_DEFUN([CHECK_KERNEL_CONFIG_BUILTIN], [
+ boolvar="$1"
AC_MSG_CHECKING(for $2)
ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
@@ -361,13 +361,39 @@
eval $boolvar="$boolchk"
])
+dnl Check kernel configurations
+AC_DEFUN([CHECK_KERNEL_CONFIG], [
+ boolvar="$1"
+ boolvar1="$1_MODULE"
+ AC_MSG_CHECKING(for $2)
+ ac_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -I$CONFIG_SND_KERNELDIR/include"
+ boolchk=""
+ AC_TRY_RUN([
+#include "$CONFIG_SND_KERNELDIR/include/linux/autoconf.h"
+int main( void ) {
+#if !defined($boolvar) && !defined($boolvar1)
+ exit(1);
+#else
+ exit(0);
+#endif
+}
+],
+ AC_MSG_RESULT("yes");boolchk="y",
+ AC_MSG_RESULT("no");boolchk="",
+ AC_MSG_RESULT("unknown");boolchk=""
+ )
+ CFLAGS="$ac_save_CFLAGS"
+ eval $boolvar="$boolchk"
+])
+
if test "$kversion.$kpatchlevel" = "2.6"; then
NEW_KBUILD=y
AC_SUBST(NEW_KBUILD)
fi
dnl Check builtin ALSA on 2.6 kernel
-CHECK_KERNEL_CONFIG(CONFIG_SND, [built-in ALSA])
+CHECK_KERNEL_CONFIG_BUILTIN(CONFIG_SND, [built-in ALSA])
if test "$CONFIG_SND" = "y"; then
AC_MSG_ERROR(You have built-in ALSA in your kernel.)
fi
@@ -893,6 +919,10 @@
fi
AC_SUBST(msmp)
+dnl Check for video device support...
+CHECK_KERNEL_CONFIG(CONFIG_VIDEO_DEV, [Video device support in kernel])
+AC_SUBST(CONFIG_VIDEO_DEV)
+
dnl Check for ISA PnP driver in kernel...
AC_MSG_CHECKING(for ISA PnP driver in kernel)
CONFIG_ISAPNP_KERNEL=
-------------------------------------------------------
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
