LU-16531 build: update version to 1.47.0-wc1

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index 3fede36..2d45cae 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -87,6 +87,7 @@ SANITIZER_CFLAGS = @lto_cflags@ @ubsan_cflags@ @addrsan_cflags@ @threadsan_cflag
 SANITIZER_LDFLAGS = @lto_ldflags@ @ubsan_ldflags@ @addrsan_ldflags@ @threadsan_ldflags@
 
 CC = @PTHREAD_CC@
+CXX = @CXX@
 BUILD_CC = @BUILD_CC@
 PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -99,7 +100,7 @@ ALL_CFLAGS_SHLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_SHLIB) $(PTHREAD_CFL
 ALL_CFLAGS_STLIB = $(CPPFLAGS) $(SANITIZER_CFLAGS) $(CFLAGS_STLIB) $(PTHREAD_CFLAGS) $(CFLAGS_WARN) @DEFS@ $(LOCAL_CFLAGS)
 LDFLAGS = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS@
 LDFLAGS_SHLIB = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_SHLIB@
-ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@
+ALL_LDFLAGS = $(LDFLAGS) @LDFLAG_DYNAMIC@ $(LOCAL_LDFLAGS)
 LDFLAGS_STATIC = $(SANITIZER_LDFLAGS) $(PTHREAD_CFLAGS) @LDFLAGS_STATIC@
 BUILD_CFLAGS = $(SANITIZER_CFLAGS) @BUILD_CFLAGS@
 BUILD_LDFLAGS = $(SANITIZER_LDFLAGS) @BUILD_LDFLAGS@
@@ -292,8 +293,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/MCONFIG \
                $(DEP_MAKEFILE) $(top_builddir)/config.status
        cd $(top_builddir); CONFIG_FILES=$(my_dir)/Makefile ./config.status
 
-@MAINTAINER_CMT@$(top_srcdir)/configure: $(top_srcdir)/configure.ac
-@MAINTAINER_CMT@       cd $(top_srcdir) && autoheader && autoconf
+$(top_srcdir)/configure: $(top_srcdir)/configure.ac
+       cd $(top_srcdir) && autoheader && autoconf
 
 coverage.txt: Makefile $(SRCS)
        if test -n "$(SRCS)"; then \