automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30834 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 965aea187a0a88f4eb27883b93e29f591ee112e7..8bc53e88d5c5f10c53e81395ca2cf36e3a83f8da 100644 (file)
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -242,6 +242,7 @@ ifneq ($(shell uname -m),armv4l)
 ifneq ($(shell uname -m),sparc64)
 ifneq (${PROC},arm)
 ifneq ($(shell uname -m), parisc)
+ifneq ($(shell uname -m), s390)
 GSM_SOURCES+= $(SRC)/k6opt.s
 endif
 endif
@@ -253,6 +254,7 @@ endif
 endif
 endif
 endif
+endif
 
 TOAST_SOURCES = $(SRC)/toast.c                 \
                $(SRC)/toast_lin.c      \