[SCM] x264/master: Force CFLAGS to be set by user via DEB_CFLAGS instead of by dpkg-buildpackage.

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

The following commit has been merged in the master branch:
commit e187b4315fe02acdbbbf8b7051f66f70c4ee3b4b
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Oct 27 15:55:14 2010 -0400

    Force CFLAGS to be set by user via DEB_CFLAGS instead of by dpkg-buildpackage.

diff --git a/debian/confflags b/debian/confflags
index f07810f..125f223 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -2,6 +2,12 @@
 # vi:syntax=make
 # configure flags logic
 
+# Set CFLAGS from DEB_CFLAGS if defined, otherwise simply add -Wall
+CFLAGS = $(shell test -z "$$DEB_CFLAGS" || echo "$$DEB_CFLAGS")
+ifeq (,$(CFLAGS))
+  CFLAGS = -Wall
+endif
+
 common_confflags += \
 	--prefix=/usr \
 	--enable-debug

-- 
x264 packaging