[xiph-commits] r9415 - in trunk/speex: . libspeex

[jm at motherfish-iii.xiph.org]

Author: jm
Date: 2005-06-08 23:31:38 -0700 (Wed, 08 Jun 2005)
New Revision: 9415

Modified:
   trunk/speex/Makefile.am
   trunk/speex/configure.ac
   trunk/speex/libspeex/misc.h
Log:
Autotools support for Blackfin (now requires automake 1.8)


Modified: trunk/speex/Makefile.am
===================================================================
--- trunk/speex/Makefile.am	2005-06-09 05:32:37 UTC (rev 9414)
+++ trunk/speex/Makefile.am	2005-06-09 06:31:38 UTC (rev 9415)
@@ -2,7 +2,7 @@
 
 # To disable automatic dependency tracking if using other tools than
 # gcc and gmake, add the option 'no-dependencies'
-AUTOMAKE_OPTIONS = 1.6
+AUTOMAKE_OPTIONS = 1.8
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = speex.m4

Modified: trunk/speex/configure.ac
===================================================================
--- trunk/speex/configure.ac	2005-06-09 05:32:37 UTC (rev 9414)
+++ trunk/speex/configure.ac	2005-06-09 06:31:38 UTC (rev 9415)
@@ -6,9 +6,9 @@
 
 SPEEX_MAJOR_VERSION=1
 SPEEX_MINOR_VERSION=1
-SPEEX_MICRO_VERSION=9
+SPEEX_MICRO_VERSION=10
 SPEEX_EXTRA_VERSION=
-#SPEEX_VERSION=1.1.7
+#SPEEX_VERSION=
 SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
 
 SPEEX_LT_CURRENT=3
@@ -109,16 +109,21 @@
   AC_DEFINE([FIXED_POINT], , [Compile as fixed-point])
 fi])
 
-AC_ARG_ENABLE(arm4-asm, [  --enable-arm4-asm       Make use of ARM4 assembly instructions],
+AC_ARG_ENABLE(arm4-asm, [  --enable-arm4-asm       Make use of ARM4 assembly optimizations],
 [if test "$enableval" = yes; then
-  AC_DEFINE([ARM4_ASM], , [Make use of ARM4 assembly instructions])
+  AC_DEFINE([ARM4_ASM], , [Make use of ARM4 assembly optimizations])
 fi])
 
-AC_ARG_ENABLE(arm5e-asm, [  --enable-arm5e-asm      Make use of ARM5E assembly instructions],
+AC_ARG_ENABLE(arm5e-asm, [  --enable-arm5e-asm      Make use of ARM5E assembly optimizations],
 [if test "$enableval" = yes; then
-  AC_DEFINE([ARM5_ASM], , [Make use of ARM5E assembly instructions])
+  AC_DEFINE([ARM5_ASM], , [Make use of ARM5E assembly optimizations])
 fi])
 
+AC_ARG_ENABLE(blackfin-asm, [  --enable-blackfin-asm      Make use of Blackfin assembly optimizations],
+[if test "$enableval" = yes; then
+  AC_DEFINE([BFIN_ASM], , [Make use of Blackfin assembly optimizations])
+fi])
+
 AC_ARG_ENABLE(fixed-point-debug, [  --enable-fixed-point-debug  Debug fixed-point implementation],
 [if test "$enableval" = yes; then
   AC_DEFINE([FIXED_DEBUG], , [Debug fixed-point implementation])

Modified: trunk/speex/libspeex/misc.h
===================================================================
--- trunk/speex/libspeex/misc.h	2005-06-09 05:32:37 UTC (rev 9414)
+++ trunk/speex/libspeex/misc.h	2005-06-09 06:31:38 UTC (rev 9415)
@@ -38,9 +38,9 @@
 #ifndef SPEEX_VERSION
 #define SPEEX_MAJOR_VERSION 1
 #define SPEEX_MINOR_VERSION 1
-#define SPEEX_MICRO_VERSION 9
+#define SPEEX_MICRO_VERSION 10
 #define SPEEX_EXTRA_VERSION ""
-#define SPEEX_VERSION "speex-1.1.9"
+#define SPEEX_VERSION "speex-1.1.10"
 #endif
 
 #include "arch.h"