[PATCH] autotools.mk: pass flavor-specific flags before _EXTRA_FLAGS.

[Emilio Pozuelo Monfort]

---
 1/class/autotools.mk.in |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/1/class/autotools.mk.in b/1/class/autotools.mk.in
index 5de6133..d536824 100644
--- a/1/class/autotools.mk.in
+++ b/1/class/autotools.mk.in
@@ -24,7 +24,7 @@ _cdbs_class_autotools = 1
 include $(_cdbs_class_path)/autotools-files.mk$(_cdbs_makefile_suffix)
 
 cdbs_autotools_configure_stamps = $(if $(cdbs_make_flavors),$(cdbs_make_builddir_check)$(patsubst %,debian/stamp-autotools/%,$(cdbs_make_flavors)),debian/stamp-autotools)
-cdbs_configure_flags += $(if $(cdbs_make_flavors),$(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor)),)
+cdbs_configure_curflavor_flags = $(if $(cdbs_make_flavors),$(DEB_CONFIGURE_FLAGS_$(cdbs_make_curflavor)),)
 
 # Overriden from makefile-vars.mk.  We pass CFLAGS and friends to
 # ./configure, so no need to pass them to make.
@@ -39,7 +39,7 @@ common-configure-impl:: $(cdbs_autotools_configure_stamps)
 $(cdbs_autotools_configure_stamps):
 	chmod a+x $(DEB_CONFIGURE_SCRIPT)
 	$(if $(call cdbs_streq,$(cdbs_make_curbuilddir),$(DEB_BUILDDIR_$(cdbs_curpkg))),,mkdir -p $(cdbs_make_curbuilddir))
-	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS)
+	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(cdbs_configure_curflavor_flags) $(DEB_CONFIGURE_USER_FLAGS)
 	$(if $(filter post,$(DEB_AUTO_UPDATE_LIBTOOL)),if [ -e $(cdbs_make_curbuilddir)/libtool ]; then cp -f /usr/bin/libtool $(cdbs_make_curbuilddir)/libtool; fi)
 	touch $@
 
-- 
1.7.2.3


--------------050005000201000505080906--