[SCM] faad2/master: Fix most autotools warnings

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 8676cca03c675f034030a8830255c324a6c9b3d6
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Tue Nov 11 07:45:33 2014 +0100

    Fix most autotools warnings

diff --git a/debian/patches/autotools-compat.patch b/debian/patches/autotools-compat.patch
new file mode 100644
index 0000000..dbcdfe3
--- /dev/null
+++ b/debian/patches/autotools-compat.patch
@@ -0,0 +1,51 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Fix most autotools warnings
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,8 @@ SUBDIRS = libfaad common frontend plugin
+ 
+ EXTRA_DIST = faad2.spec
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ rpm:	Makefile
+ 	make dist
+ 	$(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
+--- a/configure.in
++++ b/configure.in
+@@ -7,9 +7,10 @@ dnl - faad
+ dnl - xmms input mp4/aac plugin
+ dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)
+ 
+-AC_INIT
++AC_INIT([faad2], [2.7.0])
+ AC_CONFIG_AUX_DIR(.)
+-AM_INIT_AUTOMAKE(faad2, 2.7.0)
++AM_INIT_AUTOMAKE([subdir-objects])
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ AC_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+--- a/frontend/Makefile.am
++++ b/frontend/Makefile.am
+@@ -1,7 +1,7 @@
+ bin_PROGRAMS = faad
+ man_MANS = faad.man
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/common/faad \
+ 	   -I$(top_srcdir)/common/mp4ff
+ 
+ faad_LDADD = $(top_builddir)/libfaad/libfaad.la \
+--- a/plugins/mpeg4ip/Makefile.am
++++ b/plugins/mpeg4ip/Makefile.am
+@@ -13,7 +13,7 @@ faad2_plugin_la_LIBADD = \
+ 	-lm
+ 
+ 
+-INCLUDES =  -I$(top_srcdir)/include
++AM_CPPFLAGS =  -I$(top_srcdir)/include
+ 
+ AM_CFLAGS = -D_REENTRANT -fexceptions 
+ 
diff --git a/debian/patches/libfaad-drm.patch b/debian/patches/libfaad-drm.patch
index 999e237..eb9de9a 100644
--- a/debian/patches/libfaad-drm.patch
+++ b/debian/patches/libfaad-drm.patch
@@ -7,7 +7,7 @@ Description: build the DRM version of the library as well as the normal version
 -lib_LTLIBRARIES = libfaad.la
 +lib_LTLIBRARIES = libfaad.la libfaad_drm.la
  
- INCLUDES	= -iquote $(top_srcdir)/include
+ AM_CPPFLAGS	= -iquote $(top_srcdir)/include
  include_HEADERS = $(top_srcdir)/include/faad.h \
 @@ -29,3 +29,8 @@ libfaad_la_SOURCES = bits.c cfft.c decod
  		     codebook/hcb_1.h codebook/hcb_2.h codebook/hcb_3.h codebook/hcb_4.h \
diff --git a/debian/patches/series b/debian/patches/series
index c0a833f..1fbdef4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+autotools-compat.patch
 noinst-mp4ff.patch
 manpage.patch
 incorrect_pointer_size.patch

-- 
faad2 packaging