kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

small improvement :-)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7121 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-11-16 20:49:44 +00:00
parent 892978fb4b
commit 6d0b8522d0
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -4,6 +4,8 @@
2005-11-16 Kevin P. Fleming <kpfleming@digium.com> 2005-11-16 Kevin P. Fleming <kpfleming@digium.com>
* res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
* apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763) * apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763)
* channel.c (ast_queue_hangup): ensure that the channel lock is held before changing its fields... (issue #5770) * channel.c (ast_queue_hangup): ensure that the channel lock is held before changing its fields... (issue #5770)

22
res/Makefile
View File

@@ -76,6 +76,17 @@ install: all
rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so rm -f $(DESTDIR)$(MODULES_DIR)/app_agi.so
rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so rm -f $(DESTDIR)$(MODULES_DIR)/res_parking.so
for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done for x in $(MODS); do $(INSTALL) -m 755 $$x $(DESTDIR)$(MODULES_DIR) ; done
@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 may need ***";\
echo "*** it if you want to use MusicOnHold ***";\
fi
res_crypto.so: res_crypto.o res_crypto.so: res_crypto.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS) $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
@@ -105,17 +116,6 @@ endif
depend: .depend depend: .depend
.depend: .depend:
@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
../build_tools/mkdep $(CFLAGS) `ls *.c` ../build_tools/mkdep $(CFLAGS) `ls *.c`
env: env: