Make autotools a bit less whiny on modern systems

and clean up some more things that belonged to speex but aren't used
in this source tree.

Drop the SPEEX*_VERSION variables completely, we only use PACKAGE_VERSION
in the .pc file in this code.

6 files changed, 32 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index ce45b88..770bb8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,10 +5,9 @@ Makefile.in
 *.orig
 fixed
 float
-Speex.kdevelop.pcs
-Speex.kdevses
 aclocal.m4
 autom4te.cache
+compile
 config.guess
 config.h.in
 config.sub
@@ -22,20 +21,16 @@ Makefile
 .libs
 *.la
 work
-Speex.spec
+SpeexDSP.spec
 config.h
 config.log
 config.status
-include/speex/speex_config_types.h
-*.swp
+include/speex/speexdsp_config_types.h
+*.sw[lmnop]
 testdenoise
 testecho
-testenc
-testenc_uwb
-testenc_wb
+testjitter
 libtool
-speex.pc
-src/speexdec
-src/speexenc
+speexdsp.pc
 stamp-*
 patches
diff --git a/Makefile.am b/Makefile.am
index 88ca1e7..555728e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,6 +3,7 @@
 # To disable automatic dependency tracking if using other tools than
 # gcc and gmake, add the option 'no-dependencies'
 AUTOMAKE_OPTIONS = 1.8
+ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = speexdsp.pc
diff --git a/autogen.sh b/autogen.sh
index dc6f711..b58da31 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,5 +7,8 @@ test -n "$srcdir" && cd "$srcdir"
 
 echo "Updating build configuration files, please wait...."
 
+mkdir -p m4
+
+ACLOCAL_FLAGS="-I m4"
 autoreconf -if
 
diff --git a/configure.ac b/configure.ac
index 042b4de..158bf2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,33 +1,25 @@
 dnl Process this file with autoconf to produce a configure script. -*-m4-*-
 
-AC_INIT(libspeexdsp/preprocess.c)
+AC_INIT([speexdsp],[1.2rc1],[speex-dev@xiph.org])
 
-AM_CONFIG_HEADER([config.h])
+AC_CONFIG_SRCDIR([libspeexdsp/preprocess.c])
+AC_CONFIG_MACRO_DIR([m4])
 
-SPEEX_MAJOR_VERSION=1
-SPEEX_MINOR_VERSION=1
-SPEEX_MICRO_VERSION=16
-SPEEX_EXTRA_VERSION=
-#SPEEX_VERSION=
-#SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION
-SPEEX_VERSION="1.2rc1"
+dnl enable silent rules on automake 1.11 and later
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-SPEEX_LT_CURRENT=6
-SPEEX_LT_REVISION=0
-SPEEX_LT_AGE=5
 
-AC_SUBST(SPEEX_LT_CURRENT)
-AC_SUBST(SPEEX_LT_REVISION)
-AC_SUBST(SPEEX_LT_AGE)
+SPEEXDSP_LT_CURRENT=6
+SPEEXDSP_LT_REVISION=0
+SPEEXDSP_LT_AGE=5
 
-# For automake.
-VERSION=$SPEEX_VERSION
-PACKAGE=speexdsp
 
-AC_SUBST(SPEEX_VERSION)
+AC_SUBST(SPEEXDSP_LT_CURRENT)
+AC_SUBST(SPEEXDSP_LT_REVISION)
+AC_SUBST(SPEEXDSP_LT_AGE)
 
-AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
-AM_MAINTAINER_MODE
+AM_INIT_AUTOMAKE([foreign no-define])
+AM_MAINTAINER_MODE([enable])
 
 AC_CANONICAL_HOST
 AC_LIBTOOL_WIN32_DLL
@@ -116,11 +108,6 @@ AC_SUBST(src)
 
 AC_CHECK_LIB(m, sin)
 
-AC_DEFINE_UNQUOTED(SPEEX_VERSION, "${SPEEX_VERSION}", [Complete version string])
-AC_DEFINE_UNQUOTED(SPEEX_MAJOR_VERSION, ${SPEEX_MAJOR_VERSION}, [Version major])
-AC_DEFINE_UNQUOTED(SPEEX_MINOR_VERSION, ${SPEEX_MINOR_VERSION}, [Version minor])
-AC_DEFINE_UNQUOTED(SPEEX_MICRO_VERSION, ${SPEEX_MICRO_VERSION}, [Version micro])
-AC_DEFINE_UNQUOTED(SPEEX_EXTRA_VERSION, "${SPEEX_EXTRA_VERSION}", [Version extra])
 
 AC_ARG_ENABLE(valgrind, [  --enable-valgrind       Enable valgrind extra checks],
 [if test "$enableval" = yes; then
@@ -262,7 +249,8 @@ fi
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
-AC_OUTPUT([Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
+AC_CONFIG_FILES([
+           Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
            include/Makefile include/speex/Makefile speexdsp.pc
            win32/Makefile win32/libspeexdsp/Makefile
            symbian/Makefile 
@@ -282,4 +270,8 @@ AC_OUTPUT([Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
 	   ti/speex_C54_test/Makefile ti/speex_C55_test/Makefile
 	   ti/speex_C64_test/Makefile ])
 
+AC_CONFIG_HEADERS([config.h])
+
+AC_OUTPUT
+
 echo "Type \"make; make install\" to compile and install Speex";
diff --git a/libspeexdsp/Makefile.am b/libspeexdsp/Makefile.am
index d5bc5ab..2788226 100644
--- a/libspeexdsp/Makefile.am
+++ b/libspeexdsp/Makefile.am
@@ -3,7 +3,7 @@
 
 EXTRA_DIST=echo_diagnostic.m
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @FFT_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include/speex -I$(top_builddir) @FFT_CFLAGS@
 
 lib_LTLIBRARIES = libspeexdsp.la
 
@@ -28,7 +28,7 @@ noinst_HEADERS = 	arch.h 	bfin.h \
 	filterbank.h fixed_generic.h os_support.h \
 	pseudofloat.h smallft.h vorbis_psy.h resample_sse.h
 
-libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEX_LT_CURRENT@:@SPEEX_LT_REVISION@:@SPEEX_LT_AGE@
+libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@
 
 noinst_PROGRAMS = testdenoise testecho testjitter
 testdenoise_SOURCES = testdenoise.c
diff --git a/speexdsp.pc.in b/speexdsp.pc.in
index bfa8ddc..3956b3b 100644
--- a/speexdsp.pc.in
+++ b/speexdsp.pc.in
@@ -7,7 +7,7 @@ includedir=@includedir@
 
 Name: speexdsp
 Description: Speexdsp is a speech processing library that goes along with the Speex codec
-Version: @SPEEX_VERSION@
+Version: @PACKAGE_VERSION@
 Requires: @FFT_PKGCONFIG@
 Conflicts:
 Libs: -L${libdir} -lspeexdsp