diff options
author | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-08 16:52:11 +0000 |
---|---|---|
committer | malcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b> | 2004-01-08 16:52:11 +0000 |
commit | 8962cd4b9a5e9bf4bbb8f1d017195406f7f35b37 (patch) | |
tree | 1022f9dcbdf7d41da37922c7a94a329846ea14be | |
parent | 97851e365d32efffdedbee21203b91b7f9e98fdb (diff) |
Add the SuSE AMD64 support and fixes from Bug #706
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1904 f38db490-d61c-443f-a65b-d21fe96a405b
-rwxr-xr-x | Makefile | 16 | ||||
-rwxr-xr-x | codecs/gsm/Makefile | 6 | ||||
-rwxr-xr-x | codecs/lpc10/Makefile | 2 | ||||
-rwxr-xr-x | frame.c | 3 | ||||
-rwxr-xr-x | redhat/asterisk.spec | 11 |
5 files changed, 23 insertions, 15 deletions
@@ -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 diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 490f3938c..a81bcf985 100755 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -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 \ diff --git a/codecs/lpc10/Makefile b/codecs/lpc10/Makefile index 42ff10638..e9dbd9d02 100755 --- a/codecs/lpc10/Makefile +++ b/codecs/lpc10/Makefile @@ -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 @@ -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; diff --git a/redhat/asterisk.spec b/redhat/asterisk.spec index 0d663428c..ce60dc76e 100755 --- a/redhat/asterisk.spec +++ b/redhat/asterisk.spec @@ -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 |