Merge slimey's Solaris compatibility (with small mods) (bug #2740)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4446 f38db490-d61c-443f-a65b-d21fe96a405b

3 files changed, 6 insertions, 2 deletions

diff --git a/codecs/Makefile b/codecs/Makefile
index 82d8f458e..07dc35343 100755
--- a/codecs/Makefile
+++ b/codecs/Makefile
@@ -41,8 +41,8 @@ all: depend $(CODECS)
 
 clean:
 	rm -f *.so *.o .depend
-	! [ -d g723.1 ] || $(MAKE) -C g723.1 clean
-	! [ -d g723.1b ] || $(MAKE) -C g723.1b clean
+	[ ! -d g723.1 ] || $(MAKE) -C g723.1 clean
+	[ ! -d g723.1b ] || $(MAKE) -C g723.1b clean
 	$(MAKE) -C gsm clean
 	$(MAKE) -C lpc10 clean
 	$(MAKE) -C ilbc clean
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 86f25f11a..6b34233b2 100755
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -38,6 +38,7 @@ WAV49	= -DWAV49
 ######### probably require gcc. 
 
 ifneq (${OSARCH},Darwin)
+ifneq (${OSARCH},SunOS)
 ifneq (${PROC},x86_64)
 ifneq (${PROC},ultrasparc)
 ifneq ($(shell uname -m),ppc)
@@ -48,6 +49,7 @@ endif
 endif
 endif
 endif
+endif
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
 #This works for even old (2.96) versions of gcc and provides a small boost either way.
diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile
index 23d6886e8..0a2e03008 100755
--- a/codecs/lpc10/Makefile
+++ b/codecs/lpc10/Makefile
@@ -39,6 +39,7 @@ ifneq ($(PROC),alpha)
 ifeq ($(PROC),ultrasparc)
         CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
 else
+ifneq ($(OSARCH),SunOS)
         CFLAGS+= -march=$(PROC)
 endif
 endif
@@ -46,6 +47,7 @@ endif
 endif
 endif
 endif
+endif
 
 LIB = $(LIB_TARGET_DIR)/liblpc10.a