X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=MCONFIG.in;h=0e9fc6527e5171cba3352302264df8abdf7d14a3;hb=48301129641fd84e2c9cb8b753933696110e429d;hp=724a9ddb0f4c27a955f969cae5f76800de21ae13;hpb=b5ffeadece25f7dca04847dfc013e979fe36e3a6;p=tools%2Fe2fsprogs.git

diff --git a/MCONFIG.in b/MCONFIG.in
index 724a9dd..0e9fc65 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -6,6 +6,8 @@ check::
 
 SHELL = /bin/sh
 
+COMPRESS_EXT = gz bz2 bz Z
+
 prefix = @prefix@
 root_prefix = @root_prefix@
 exec_prefix = @exec_prefix@
@@ -16,6 +18,7 @@ bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
 datadir= @datadir@
+localedir = $(datadir)/locale
 root_sysconfdir= @root_sysconfdir@
 includedir = @includedir@
 mandir = @mandir@
@@ -31,11 +34,13 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 CC = @CC@
 BUILD_CC = @BUILD_CC@
-DEFS = @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
+INTL_FLAGS = @INTL_FLAGS@
 ALL_CFLAGS = $(CPPFLAGS) $(DEFS) $(USE_WFLAGS) $(CFLAGS) $(XTRA_CFLAGS) \
-	-I$(top_builddir)/lib -I$(top_srcdir)/lib $(LINUX_INCLUDE) 
+	$(INTL_FLAGS) -I$(top_builddir)/lib -I$(top_srcdir)/lib \
+	$(LINUX_INCLUDE) 
 LDFLAGS = @LDFLAGS@
 ALL_LDFLAGS = $(LDFLAGS)
 RM = @RM@
@@ -63,6 +68,8 @@ LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
 LIBE2P = $(LIB)/libe2p@LIB_EXT@
 LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
 LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@ 
+LIBBLKID = $(LIB)/libblkid@LIB_EXT@
+LIBINTL = @LIBINTL@
 DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
 
 STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
@@ -70,6 +77,7 @@ STATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
 STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
 STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
 STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
+STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
 DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
@@ -77,6 +85,7 @@ PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
 PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
 PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
 PROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@ @SOCKET_LIB@ 
+PROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@
 DEPPROFILED_LIBUUID = $(LIB)/libuuid@PROFILED_LIB_EXT@
 
 #
@@ -100,6 +109,7 @@ LINUX_INCLUDE=@LINUX_INCLUDE@
 #
 SUBST_CONF=$(top_builddir)/util/subst.conf
 SUBSTITUTE= $(top_builddir)/util/subst -f $(SUBST_CONF)
+SUBSTITUTE_UPTIME= $(top_builddir)/util/subst -t -f $(SUBST_CONF)
 DEP_SUBSTITUTE= $(top_builddir)/util/subst $(SUBST_CONF)
 
 $(top_builddir)/util/subst:
@@ -111,11 +121,14 @@ $(top_builddir)/util/subst:
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=		-ansi -D_POSIX_SOURCE -pedantic \
-			-Wall -Wwrite-strings -Wpointer-arith \
-			-Wcast-qual -Wcast-align -Wtraditional \
+WFLAGS=		-ansi -D_POSIX_SOURCE -pedantic $(WFLAGS_EXTRA) \
+			-Wall -W -Wwrite-strings -Wpointer-arith \
+			-Wcast-qual -Wcast-align  \
 			-Wstrict-prototypes -Wmissing-prototypes \
-			-Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow 
+			-Wformat-security  -Wformat-nonliteral \
+			-Wmissing-format-attribute \
+			-Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow \
+			-UENABLE_NLS
 
 gcc-wall-new:
 	(make USE_WFLAGS="$(WFLAGS)" > /dev/null) 2>&1 | sed -f $(top_srcdir)/util/gcc-wall-cleanup