[xiph-commits] r14169 - trunk/vorbis

[ivo at svn.xiph.org]

Author: ivo
Date: 2007-11-17 07:27:32 -0800 (Sat, 17 Nov 2007)
New Revision: 14169

Added:
   trunk/vorbis/m4/
Modified:
   trunk/vorbis/Makefile.am
   trunk/vorbis/autogen.sh
   trunk/vorbis/configure.in
Log:
Erik de Castro Lopo's patch to add -Wdeclaration-after-statement.  Closes ticket #1232

Modified: trunk/vorbis/Makefile.am
===================================================================
--- trunk/vorbis/Makefile.am	2007-11-16 14:08:06 UTC (rev 14168)
+++ trunk/vorbis/Makefile.am	2007-11-17 15:27:32 UTC (rev 14169)
@@ -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

Modified: trunk/vorbis/autogen.sh
===================================================================
--- trunk/vorbis/autogen.sh	2007-11-16 14:08:06 UTC (rev 14168)
+++ trunk/vorbis/autogen.sh	2007-11-17 15:27:32 UTC (rev 14169)
@@ -4,6 +4,8 @@
 
 package="vorbis"
 
+ACLOCAL_FLAGS="-I m4"
+
 olddir=`pwd`
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.

Modified: trunk/vorbis/configure.in
===================================================================
--- trunk/vorbis/configure.in	2007-11-16 14:08:06 UTC (rev 14168)
+++ trunk/vorbis/configure.in	2007-11-17 15:27:32 UTC (rev 14169)
@@ -14,6 +14,9 @@
 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 @@
 		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_OUTPUT([
 Makefile
+m4/Makefile
 lib/Makefile
 lib/modes/Makefile
 lib/books/Makefile