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

Add the SuSE AMD64 support and fixes from Bug #706

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1904 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Malcolm Davenport
2004-01-08 16:52:11 +00:00
parent 772b6b66b1
commit 3470e79f83
5 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile
View File

@@ -388,13 +388,13 @@ samples: all datafiles adsi
install $$x $(DESTDIR)$(ASTVARLIBDIR)/mohmp3 ; \
done
mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
:> $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail/default/1234/unavail.gsm
:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail/default/1234/unavail.gsm ; \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm ; \
done
:> $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail/default/1234/busy.gsm
for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isonphone; do \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTVARLIBDIR)/sounds/voicemail/default/1234/busy.gsm ; \
cat $(DESTDIR)$(ASTVARLIBDIR)/sounds/$$x.gsm >> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/busy.gsm ; \
done
webvmail:
@@ -428,13 +428,9 @@ __rpm: _version
$(MAKE) DESTDIR=/tmp/asterisk samples ; \
mkdir -p /tmp/asterisk/etc/rc.d/init.d ; \
cp -f redhat/asterisk /tmp/asterisk/etc/rc.d/init.d/ ; \
cp -f redhat/rpmrc /tmp/asterisk/ ; \
cp -f redhat/rpmmacros /tmp/asterisk/ ; \
sed "s/Version:/Version: $(RPMVERSION)/g" redhat/asterisk.spec > /tmp/asterisk/asterisk.spec ; \
rpm --rcfile /usr/lib/rpm/rpmrc:/tmp/asterisk/rpmrc -bb /tmp/asterisk/asterisk.spec ; \
mv /tmp/asterisk/redhat/RPMS/i386/asterisk* ./ ; \
rm -rf /tmp/asterisk
sed "s/^Version:.*/Version: $(RPMVERSION)/g" redhat/asterisk.spec > asterisk.spec ; \
rpmbuild --rcfile /usr/lib/rpm/rpmrc:redhat/rpmrc -bb asterisk.spec
progdocs:
doxygen asterisk-ng-doxygen

6
codecs/gsm/Makefile
View File

@@ -38,8 +38,10 @@ WAV49 = -DWAV49
######### probably require gcc.
ifneq (${OSARCH},Darwin)
ifneq (${PROC},x86_64)
OPTIMIZE+=-march=$(PROC)
endif
endif
PG =
#PG = -g -pg
@@ -194,8 +196,10 @@ GSM_SOURCES = $(SRC)/add.c \
$(SRC)/short_term.c \
$(SRC)/table.c
ifeq (${OSARCH},Linux)
ifneq (${PROC},x86_64)
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
TOAST_SOURCES = $(SRC)/toast.c \
$(SRC)/toast_lin.c \
@@ -241,8 +245,10 @@ GSM_OBJECTS = $(SRC)/add.o \
$(SRC)/short_term.o \
$(SRC)/table.o
ifeq (${OSARCH},Linux)
ifneq (${PROC},x86_64)
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif
TOAST_OBJECTS = $(SRC)/toast.o \
$(SRC)/toast_lin.o \

2
codecs/lpc10/Makefile
View File

@@ -28,9 +28,11 @@ CFLAGS = $(OPTIMIZE) -I$(LIB_TARGET_DIR) $(WARNINGS) -fPIC
#fix for PPC processors
ifneq ($(OSARCH),Darwin)
ifneq ($(PROC),ppc)
ifneq ($(PROC),x86_64)
CFLAGS+= -march=$(PROC)
endif
endif
endif
LIB = $(LIB_TARGET_DIR)/liblpc10.a

3
frame.c
View File

@@ -455,7 +455,8 @@ static int show_codecs(int fd, int argc, char *argv[])
return RESULT_SHOWUSAGE;
if (getenv("I_AM_NOT_AN_IDIOT") == NULL)
ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n\tIt does not indicate anything about your configuration.\n");
ast_cli(fd, "Disclaimer: this command is for informational purposes only.\n"
"\tIt does not indicate anything about your configuration.\n");
if ((argc == 2) || (!strcasecmp(argv[1],"audio"))) {
found = 1;

11
redhat/asterisk.spec
View File

@@ -65,6 +65,8 @@ ln -sf /var/spool/asterisk/vm /var/lib/asterisk/sounds/vm
%attr(0644,root,root) /var/lib/asterisk/sounds/*.gsm
%attr(0755,root,root) %dir /var/lib/asterisk/sounds/digits
%attr(0644,root,root) /var/lib/asterisk/sounds/digits/*.gsm
%attr(0755,root,root) %dir /var/lib/asterisk/mohmp3
%attr(0644,root,root) /var/lib/asterisk/mohmp3/*
%attr(0755,root,root) %dir /var/lib/asterisk/images
%attr(0644,root,root) /var/lib/asterisk/images/*
%attr(0755,root,root) %dir /var/lib/asterisk/keys
@@ -76,7 +78,8 @@ ln -sf /var/spool/asterisk/vm /var/lib/asterisk/sounds/vm
# Example voicemail files
#
%attr(0755,root,root) %dir /var/spool/asterisk
%attr(0755,root,root) %dir /var/spool/asterisk/vm
%attr(0755,root,root) %dir /var/spool/asterisk/vm/1234
%attr(0755,root,root) %dir /var/spool/asterisk/vm/1234/INBOX
%attr(0644,root,root) /var/spool/asterisk/vm/1234/*.gsm
%attr(0755,root,root) %dir /var/spool/asterisk/voicemail
%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default
%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default/1234
%attr(0755,root,root) %dir /var/spool/asterisk/voicemail/default/1234/INBOX
%attr(0644,root,root) /var/spool/asterisk/voicemail/default/1234/*.gsm