[Asterisk-cvs] asterisk/res Makefile,1.20,1.21

[kpfleming at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv16604/res

Modified Files:
	Makefile 
Log Message:
fix Solaris compatibility issues (bug #4339)


Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/res/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- Makefile	27 Mar 2005 22:39:17 -0000	1.20
+++ Makefile	20 May 2005 03:18:35 -0000	1.21
@@ -58,14 +58,16 @@
 depend: .depend
 
 .depend:
-	@if ! which mpg123 &>/dev/null ; then \
-		echo "*** You don't have mpg123 installed. You're going to need ***";\
-		echo "***       it if you want MusicOnHold                      ***";\
-	elif ! mpg123 --longhelp 2>&1 | grep .59r &>/dev/null ; then \
+	@if [ x`which mpg123 2>/dev/null | grep -v '^no'` != x ] ; then \
+	  if mpg123 --longhelp 2>&1 | grep -q .59r 2>&1 >/dev/null ; then echo ; else \
 			echo "*************************************************************";\
 			echo "*** You have the WRONG version of mpg123... you need .59r ***";\
 			echo "*** Use 'make mpg123' to get the right verison            ***";\
 			echo "*************************************************************";\
+	  fi ;\
+	else \
+		echo "*** You don't have mpg123 installed. You're going to need ***";\
+		echo "***       it if you want MusicOnHold                      ***";\
  	fi
 	../mkdep $(CFLAGS) `ls *.c`