From: Kevin P. Fleming <kpfleming@digium.com>
Date: Tue, 30 May 2006 16:08:38 +0000 (+0000)
Subject: Merged revisions 30802 via svnmerge from
X-Git-Tag: 1.4.0-beta1~1159
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96016e9206138ceb0bf6b21b8cd58b666b2f7881;p=thirdparty%2Fasterisk.git

Merged revisions 30802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r30802 | kpfleming | 2006-05-30 11:07:16 -0500 (Tue, 30 May 2006) | 2 lines

another S/390 build fix

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@30803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index bfa73b3c8a..12a74f7f6f 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -212,7 +212,7 @@ GSM_SOURCES =	$(SRC)/add.c		\
 # XXX Keep a space after each findstring argument
 # XXX should merge with GSM_OBJECTS
 ifeq (${OSARCH},Linux)
-ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
+ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
 ifeq (,$(findstring ${PROC} , arm ia64 ))
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif