Merge branch '2.4.x'

[mLib] / vars.am

diff --git a/vars.am b/vars.am
index 79a60a53dd8176d60054cf41b1c858bab008e9b2..9870cef014b52a44150196577f2e8331c43f833b 100644 (file)
--- a/vars.am
+++ b/vars.am
@@ -87,12 +87,13 @@ SUBSTITUTIONS = \
        prefix=$(prefix) exec_prefix=$(exec_prefix) \
        libdir=$(libdir) includedir=$(includedir) \
        bindir=$(bindir) sbindir=$(sbindir) \
-       PACKAGE=$(PACKAGE) VERSION=$(VERSION)
+       PACKAGE=$(PACKAGE) VERSION=$(VERSION) \
+       MLIB_LIBS="$(MLIB_LIBS)"
 
-V_SUBST = $(V_SUBST_$(V))
-V_SUBST_ = $(V_SUBST_$(AM_DEFAULT_VERBOSITY))
-V_SUBST_0 = @echo "  SUBST  $@";
-SUBST = $(V_SUBST)$(confsubst)
+V_SUBST                         = $(V_SUBST_@AM_V@)
+V_SUBST_                = $(V_SUBST_@AM_DEFAULT_V@)
+V_SUBST_0               = @echo "  SUBST    $@";
+SUBST                   = $(V_SUBST)$(confsubst)
 
 ###--------------------------------------------------------------------------
 ### Building utilities.