Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32227
Modified Files:
Makefile Makefile.conf.in Rules.make configure.in
Log Message:
- fixed the detection of x86-64 arch.
it has to be before the detection of K8.
- fixed the build with the recent SUSE kernels.
Index: Makefile
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- Makefile 27 May 2004 18:24:57 -0000 1.109
+++ Makefile 9 Jun 2004 17:33:47 -0000 1.110
@@ -103,7 +103,7 @@
.PHONY: compile
compile: include/sound/version.h include/sndversions.h
ifdef NEW_KBUILD
- $(MAKE) -C $(CONFIG_SND_KERNELDIR) SUBDIRS=$(MAINSRCDIR)/kbuild modules
+ $(MAKE) -C $(CONFIG_SND_KERNELDIR) SUBDIRS=$(MAINSRCDIR)/kbuild $(MAKE_ADDS)
modules
else
@for d in $(SUBDIRS); do if ! $(MAKE) -C $$d; then exit 1; fi; done
endif
Index: Makefile.conf.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Makefile.conf.in,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Makefile.conf.in 5 Mar 2004 11:49:44 -0000 1.62
+++ Makefile.conf.in 9 Jun 2004 17:33:47 -0000 1.63
@@ -54,8 +54,9 @@
SNDVERSIONS = $(TOPDIR)/include/sndversions.h
DEXPORT = $(TOPDIR)/include/modules
else
-EXTRA_CFLAGS += -I$(MAINSRCDIR)/include -Iinclude -DALSA_BUILD
-CPPFLAGS := $(subst -Iinclude ,,$(CPPFLAGS))
-CFLAGS := $(subst -Iinclude ,,$(CFLAGS))
+EXTRA_CFLAGS += -DALSA_BUILD
+CPPFLAGS := -I$(MAINSRCDIR)/include $(CPPFLAGS)
+CFLAGS := -I$(MAINSRCDIR)/include $(CFLAGS)
+MAKE_ADDS = @MAKE_ADDS@
endif
Index: Rules.make
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Rules.make 27 May 2004 18:24:57 -0000 1.39
+++ Rules.make 9 Jun 2004 17:33:47 -0000 1.40
@@ -18,7 +18,6 @@
prepare: $(clean-files)
@for d in $(patsubst %/,%,$(filter %/, $(obj-y))) \
$(patsubst %/,%,$(filter %/, $(obj-m))) DUMMY; do \
- echo $$d; \
if [ $$d != DUMMY ]; then $(MAKE) -C $$d prepare; fi; \
done
Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -r1.247 -r1.248
--- configure.in 31 May 2004 13:13:11 -0000 1.247
+++ configure.in 9 Jun 2004 17:33:47 -0000 1.248
@@ -74,9 +74,7 @@
kerneldir="$withval",
kerneldir="$DEFAULT_KERNEL_DIR"
)
-AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELDIR, "$kerneldir")
CONFIG_SND_KERNELDIR="$kerneldir"
-AC_SUBST(CONFIG_SND_KERNELDIR)
AC_MSG_RESULT($kerneldir)
dnl Check for kernel version...
@@ -442,6 +440,42 @@
fi
fi
+dnl Check for forced SUSE kernels
+AC_MSG_CHECKING(for SUSE kernel)
+AC_ARG_WITH(suse,
+ [ --with-suse=no,yes,auto specify SUSE kernel build],
+ suse_kernel="$withval", suse_kernel="auto")
+CONFIG_SUSE_KERNEL="auto"
+if test "$suse_kernel" = "yes"; then
+ CONFIG_SUSE_KERNEL="y"
+ AC_MSG_RESULT("yes")
+else
+ if test "$suse_kernel" = "no"; then
+ CONFIG_SUSE_KERNEL=""
+ AC_MSG_RESULT("no")
+ else
+ AC_MSG_RESULT("auto")
+ CHECK_KERNEL_CONFIG(CONFIG_SUSE_KERNEL, [SUSE kernel])
+ fi
+fi
+
+MAKE_ADDS=""
+if test "$CONFIG_SUSE_KERNEL" = "y"; then
+ if test ! -f $CONFIG_SND_KERNELDIR/include/linux/kernel.h; then
+ if test "$CONFIG_SND_KERNELDIR" != "/usr/src/linux"; then
+ echo "Tweaking the kernel source directories for SUSE kernels..."
+ MAKE_ADDS="O=$CONFIG_SND_KERNELDIR"
+ CONFIG_SND_KERNELDIR="/usr/src/linux"
+ KERNEL_INC="-I$CONFIG_SND_KERNELDIR/include"
+ fi
+ fi
+fi
+
+dnl define kernel directory now
+AC_DEFINE_UNQUOTED(CONFIG_SND_KERNELDIR, "$CONFIG_SND_KERNELDIR")
+AC_SUBST(CONFIG_SND_KERNELDIR)
+AC_SUBST(MAKE_ADDS)
+
dnl Check kernel headers for 2.2
MODIFY_KERNEL_HEADER(linux/kmod.h, __LINUX_KMOD_H__)
CHECK_KERNEL_HEADER(linux/compiler.h)
@@ -623,6 +657,8 @@
fprintf(file, "i486");
#elif defined(CONFIG_M586)
fprintf(file, "i586");
+#elif defined(CONFIG_X86_64) /* this needs to be chcked before K8 */
+ fprintf(file, "x86_64");
#elif defined(CONFIG_M586TSC)
fprintf(file, "i586tsc");
#elif defined(CONFIG_M586MMX)
@@ -675,8 +711,6 @@
fprintf(file, "sparc");
#elif defined(CONFIG_SPARC64)
fprintf(file, "sparc64");
-#elif defined(CONFIG_X86_64)
- fprintf(file, "x86_64");
#elif defined(CONFIG_ARCH_SA1100)
fprintf(file, "sa1100");
#elif defined(CONFIG_ARCH_PXA)
-------------------------------------------------------
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite! GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
