[SCM] libaacs/master: Don't override CFLAGS in src/Makefile.am.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a333913f204927ae637f126943004bca4da71f0d
Author: Alessio Treglia <alessio at debian.org>
Date:   Fri Jan 13 11:09:48 2012 +0100

    Don't override CFLAGS in src/Makefile.am.

diff --git a/debian/patches/0001-buildsystem.patch b/debian/patches/0001-buildsystem.patch
index 5e34378..30e0e5a 100644
--- a/debian/patches/0001-buildsystem.patch
+++ b/debian/patches/0001-buildsystem.patch
@@ -3,8 +3,8 @@ Description: Link against gpg-error to make it find the gpg_strerror_r function.
 Forwarded: libaacs-devel at videolan.org
 ---
  configure.ac    |   15 +++++++++++++++
- src/Makefile.am |    4 ++--
- 2 files changed, 17 insertions(+), 2 deletions(-)
+ src/Makefile.am |    6 +++---
+ 2 files changed, 18 insertions(+), 3 deletions(-)
 
 --- libaacs.orig/configure.ac
 +++ libaacs/configure.ac
@@ -32,15 +32,18 @@ Forwarded: libaacs-devel at videolan.org
  {
 --- libaacs.orig/src/Makefile.am
 +++ libaacs/src/Makefile.am
-@@ -9,7 +9,7 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
+@@ -9,9 +9,9 @@ SET_DEBUG_OPTS = @SET_DEBUG_OPTS@
  SET_INCLUDES = -I$(top_srcdir) -Ifile
  
  AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_WARNINGS) $(SET_OPTIMIZATIONS) \
 -	$(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS)
 +	$(SET_DEBUG_OPTS) $(SET_INCLUDES) $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
  AM_YFLAGS = -d -p libaacs_yy
- CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
+-CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
++## CFLAGS=$(shell test -z "$$CFLAGS" || echo "$$CFLAGS")
  
+ lib_LTLIBRARIES = libaacs.la
+ libaacs_la_SOURCES=libaacs/aacs.h \
 @@ -50,7 +50,7 @@ endif
  
  libaacs_ladir= $(includedir)/libaacs

-- 
libaacs packaging