[Astlinux-commits] SF.net SVN: astlinux:[5368] branches/1.0/package

[<abe...@us...>]

Revision: 5368
          http://astlinux.svn.sourceforge.net/astlinux/?rev=5368&view=rev
Author:   abelbeck
Date:     2012-01-10 23:05:20 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
dahdi-linux and dahdi-tools, auto-select versions based on rhino, wanpipe, zaphfc or none

Modified Paths:
--------------
    branches/1.0/package/dahdi-linux/dahdi-linux.mk
    branches/1.0/package/dahdi-tools/dahdi-tools.mk

Modified: branches/1.0/package/dahdi-linux/dahdi-linux.mk
===================================================================
--- branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-01-10 22:15:57 UTC (rev 5367)
+++ branches/1.0/package/dahdi-linux/dahdi-linux.mk	2012-01-10 23:05:20 UTC (rev 5368)
@@ -3,7 +3,19 @@
 # dahdi-linux
 #
 ##############################################################
+ifeq ($(BR2_PACKAGE_RHINO),y)
 DAHDI_LINUX_VERSION := 2.4.1.1
+else
+ ifeq ($(BR2_PACKAGE_DAHDI_ZAPHFC),y)
+DAHDI_LINUX_VERSION := 2.4.1.1
+ else
+  ifeq ($(BR2_PACKAGE_WANPIPE),y)
+DAHDI_LINUX_VERSION := 2.4.1.1
+  else
+DAHDI_LINUX_VERSION := 2.6.0
+  endif
+ endif
+endif
 DAHDI_LINUX_SOURCE := dahdi-linux-$(DAHDI_LINUX_VERSION).tar.gz
 DAHDI_LINUX_SITE := http://downloads.asterisk.org/pub/telephony/dahdi-linux/releases
 DAHDI_LINUX_DIR := $(BUILD_DIR)/dahdi-linux-$(DAHDI_LINUX_VERSION)

Modified: branches/1.0/package/dahdi-tools/dahdi-tools.mk
===================================================================
--- branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-01-10 22:15:57 UTC (rev 5367)
+++ branches/1.0/package/dahdi-tools/dahdi-tools.mk	2012-01-10 23:05:20 UTC (rev 5368)
@@ -3,7 +3,19 @@
 # dahdi-tools
 #
 ##############################################################
+ifeq ($(BR2_PACKAGE_RHINO),y)
 DAHDI_TOOLS_VERSION := 2.4.1
+else
+ ifeq ($(BR2_PACKAGE_DAHDI_ZAPHFC),y)
+DAHDI_TOOLS_VERSION := 2.4.1
+ else
+  ifeq ($(BR2_PACKAGE_WANPIPE),y)
+DAHDI_TOOLS_VERSION := 2.4.1
+  else
+DAHDI_TOOLS_VERSION := 2.6.0
+  endif
+ endif
+endif
 DAHDI_TOOLS_SOURCE := dahdi-tools-$(DAHDI_TOOLS_VERSION).tar.gz
 DAHDI_TOOLS_SITE := http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases
 DAHDI_TOOLS_DIR := $(BUILD_DIR)/dahdi-tools-$(DAHDI_TOOLS_VERSION)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.