Merge pull request #26 from hartwork/build-system-misc

Fix and improve build system

.gitignore

@@ -1,3 +1,5 @@
+ABOUT-NLS
+m4
 missing
 aclocal.m4
 config.guess

Makefile.am

@@ -33,7 +33,7 @@ plugin_LTLIBRARIES = \
 	latency_1914.la xfade_1915.la sc4m_1916.la \
 	mbeq_1197.la pitch_scale_1193.la pitch_scale_1194.la imp_1199.la
 
-SUBDIRS = m4  po util gsm gverb metadata
+SUBDIRS = po util gsm gverb metadata
 
 # Wacky stuff to stop automake getting confused
 EXTRA_DIST = config.rpath  @top_srcdir@/*.xml @top_srcdir@/*.c @top_srcdir@/*.h \
@@ -91,7 +91,7 @@ butterworth_1902_la_SOURCES = butterworth_1902.c
 
 # Rule to build .c files from XML source
 %.c:	%.xml
-	./makestub.pl $*.xml > $*.c
+	! test -f "$*.xml" || ./makestub.pl "$*.xml" > "$*.c"
 
 #strip .libs/$$file;
 

autogen.sh

@@ -1,39 +1,5 @@
 #! /bin/sh
-
-([ -x libtoolize ] && libtoolize --force --copy) || glibtoolize --force --copy
-touch config.rpath
-
-echo aclocal...
-(aclocal --version) < /dev/null > /dev/null 2>&1 || {
-    echo aclocal not found
-    exit 1
-}
-
-aclocal -I m4 || exit 1
-
-echo autoheader...
-(autoheader --version) < /dev/null > /dev/null 2>&1 || {
-    echo autoheader not found
-    exit 1
-}    
-
-autoheader || exit 1
-
-echo automake...
-(automake --version) < /dev/null > /dev/null 2>&1 || {
-    echo automake not found
-    exit 1
-}
-
-automake --add-missing --copy --gnu || exit 1
-
-echo autoconf...
-(autoconf --version) < /dev/null > /dev/null 2>&1 || {
-    echo autoconf not found
-    exit 1
-}
-
-autoconf || exit 1
+autoreconf -i -I m4 || exit 1
 
 test -n "$NOCONFIGURE" || ./configure "$@"
 

configure.ac

@@ -1,7 +1,9 @@
-AC_INIT(amp_1181.xml)
+AC_INIT([swh-plugins], [0.4.15])
+AC_CONFIG_SRCDIR([amp_1181.xml])
 AC_CANONICAL_SYSTEM
+AC_CONFIG_MACRO_DIRS([m4])
 AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE(swh-plugins, 0.4.15)
+AM_INIT_AUTOMAKE
 
 AM_DISABLE_STATIC
 
@@ -53,7 +55,7 @@ AM_PROG_CC_C_O
 AC_REQUIRE_CPP
 ALL_LINGUAS="en_GB"
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.13])
+AM_GNU_GETTEXT_VERSION([0.19.3])
 AC_C_BIGENDIAN
 
 LIBS="$LIBS -lm"
@@ -144,7 +146,7 @@ AC_SUBST(FFTW_LIBS)
 AC_SUBST(STATIC_FFTW_LIBS)
 AC_SUBST(FFTW_CFLAGS)
 AC_SUBST(LIBTOOL)
-AC_OUTPUT([ m4/Makefile 
+AC_OUTPUT([
 Makefile
 util/Makefile
 gsm/Makefile