Update of /cvsroot/alsa/alsa-driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24643

Modified Files:
        Rules.make configure.in 
Log Message:
- fixed and clean upthe build without isapnp support.
  empty *.isapnp will be made when isapnp is not supported.






Index: Rules.make
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/Rules.make,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- Rules.make  4 Dec 2003 10:55:48 -0000       1.36
+++ Rules.make  26 Jan 2004 11:08:48 -0000      1.37
@@ -129,7 +129,12 @@
        patch -p0 -i $<
 
 %.isapnp: %.c
+ifeq (y,$(CONFIG_ISAPNP))
        $(CPP) -C -D__KERNEL__ $(CFLAGS) $(EXTRA_CFLAGS) -D__isapnp_now__ 
-DKBUILD_BASENAME=$(subst $(comma),_,$(subst -,_,$(*F))) $(CFLAGS_$@) $(CFLAGS_$@) $< 
| awk -f $(TOPDIR)/utils/convert_isapnp_ids > $@
+else
+       rm -f $@
+       touch $@
+endif
 
 #
 #

Index: configure.in
===================================================================
RCS file: /cvsroot/alsa/alsa-driver/configure.in,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- configure.in        26 Jan 2004 10:44:44 -0000      1.214
+++ configure.in        26 Jan 2004 11:08:48 -0000      1.215
@@ -955,11 +955,11 @@
 
 AC_SUBST(CONFIG_ISAPNP)
 if test "$CONFIG_ISAPNP" = "y"; then
-  AC_DEFINE(CONFIG_ISAPNP)
+  AC_DEFINE(CONFIG_SND_ISAPNP)
   CONFIG_PNP=$CONFIG_ISAPNP
-  AC_DEFINE(CONFIG_PNP)
-  AC_SUBST(CONFIG_PNP)
+  AC_DEFINE(CONFIG_SND_PNP)
 fi
+AC_SUBST(CONFIG_PNP)
 
 dnl Check for strlcpy...
 AC_MSG_CHECKING(for strlcpy)



-------------------------------------------------------
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

Reply via email to