[SCM] mp4v2/master: debian/rules: correcting silly changes about armhf

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

The following commit has been merged in the master branch:
commit 0cc4aa2e8af8091580e91b0c2cd526090c5b639a
Author: Matteo F. Vescovi <m.vescovi at revese.it>
Date:   Tue Oct 25 15:37:56 2011 +0200

    debian/rules: correcting silly changes about armhf
    
    Git-Dch: Ignore

diff --git a/debian/rules b/debian/rules
index 3eab58f..18c8213 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 export DH_OPTIONS
 
-include debian/confflags
-
 CXXFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 DEB_HOST_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -15,7 +13,7 @@ endif
 	dh $@ --parallel --with autotools_dev
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static=no --disable-optimize
+	dh_auto_configure -- --enable-static=no $(confflags)
 
 override_dh_auto_test:
 	dh_auto_test || true

-- 
mp4v2 packaging