[svn-commits] mattf: tag 1.4.10.1 r4211 - in /tags/1.4.10.1: ./ kernel/xpp/ kernel/xpp/util...

[SVN commits to the Digium repositories]

Author: mattf
Date: Thu May  1 11:10:21 2008
New Revision: 4211

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4211
Log:
Add patches in and remove old logs and version

Removed:
    tags/1.4.10.1/.version
    tags/1.4.10.1/ChangeLog
Modified:
    tags/1.4.10.1/kernel/xpp/.version
    tags/1.4.10.1/kernel/xpp/Kbuild
    tags/1.4.10.1/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm

Modified: tags/1.4.10.1/kernel/xpp/.version
URL: http://svn.digium.com/view/zaptel/tags/1.4.10.1/kernel/xpp/.version?view=diff&rev=4211&r1=4210&r2=4211
==============================================================================
--- tags/1.4.10.1/kernel/xpp/.version (original)
+++ tags/1.4.10.1/kernel/xpp/.version Thu May  1 11:10:21 2008
@@ -1,1 +1,1 @@
-trunk-r5512
+trunk-r5566

Modified: tags/1.4.10.1/kernel/xpp/Kbuild
URL: http://svn.digium.com/view/zaptel/tags/1.4.10.1/kernel/xpp/Kbuild?view=diff&rev=4211&r1=4210&r2=4211
==============================================================================
--- tags/1.4.10.1/kernel/xpp/Kbuild (original)
+++ tags/1.4.10.1/kernel/xpp/Kbuild Thu May  1 11:10:21 2008
@@ -20,7 +20,7 @@
 
 obj-m		+= xpp.o xpd_fxs.o xpd_fxo.o xpd_pri.o
 
-HAS_BRISTUFF		:= $(shell cpp $(CPPFLAGS) -dM $(ZAP_KERNEL)/zconfig.h | sed -n 's/^.*CONFIG_ZAPATA_BRI_DCHANS/y/p')
+HAS_BRISTUFF	:= $(shell grep '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_ZAPATA_BRI_DCHANS\>' $(ZAP_KERNEL)/zconfig.h)
 
 # Build only supported modules
 ifneq	(,$(filter y m,$(CONFIG_USB)))

Modified: tags/1.4.10.1/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm
URL: http://svn.digium.com/view/zaptel/tags/1.4.10.1/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm?view=diff&rev=4211&r1=4210&r2=4211
==============================================================================
--- tags/1.4.10.1/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm (original)
+++ tags/1.4.10.1/kernel/xpp/utils/zconf/Zaptel/Config/Defaults.pm Thu May  1 11:10:21 2008
@@ -46,7 +46,9 @@
 			}
 		}
 	}
-	die "No default_file" unless $default_file;
+	if (! $default_file) {
+		return ("", ());
+	}
 	my %vars = Zaptel::Config::Defaults::do_source($default_file, @vars);
 	return ($default_file, %vars);
 }