From 797fbb016b23aef9892a5172a3f6273149eb73a5 Mon Sep 17 00:00:00 2001
From: ivo <ivo@xiph.org>
Date: Sat, 17 Nov 2007 15:27:32 +0000
Subject: [PATCH] Erik de Castro Lopo's patch to add
 -Wdeclaration-after-statement.  Closes ticket #1232

svn path=/trunk/vorbis/; revision=14169
---
 Makefile.am  | 2 +-
 autogen.sh   | 2 ++
 configure.in | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.am b/Makefile.am
index 4005171..52f68d0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 
 AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
 
-SUBDIRS = include vq lib examples doc
+SUBDIRS = m4 include vq lib examples doc
 
 m4datadir = $(datadir)/aclocal
 m4data_DATA = vorbis.m4
diff --git a/autogen.sh b/autogen.sh
index 2979b2d..cc0389f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,6 +4,8 @@
 
 package="vorbis"
 
+ACLOCAL_FLAGS="-I m4"
+
 olddir=`pwd`
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
diff --git a/configure.in b/configure.in
index f62f77b..38db11d 100644
--- a/configure.in
+++ b/configure.in
@@ -14,6 +14,9 @@ AM_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE(libvorbis,1.2.1svn)
 AM_MAINTAINER_MODE
 
+dnl Add parameters for aclocal
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+
 dnl Library versioning
 
 V_LIB_CURRENT=4
@@ -171,6 +174,8 @@ else
 		CFLAGS="-O20 -Wall -Wextra -D__NO_MATH_INLINES -fsigned-char"
 		PROFILE="-O20 -g -pg -D__NO_MATH_INLINES -fsigned-char" ;;
         esac
+
+        AC_ADD_CFLAGS([-Wdeclaration-after-statement])
 fi
 CFLAGS="$CFLAGS $cflags_save"
 
@@ -229,6 +234,7 @@ AC_SUBST(pthread_lib)
 
 AC_OUTPUT([
 Makefile
+m4/Makefile
 lib/Makefile
 lib/modes/Makefile
 lib/books/Makefile
-- 
2.7.4