com_err.h: Retore the type of n_msgs in the error_table

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index 2e1ac56..05b2ae2 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -6,15 +6,20 @@ check::
 
 SHELL = /bin/sh
 
+COMPRESS_EXT = gz bz2 bz Z
+
 prefix = @prefix@
 root_prefix = @root_prefix@
 exec_prefix = @exec_prefix@
-root_bindir = $(root_prefix)/bin
-root_sbindir = $(root_prefix)/sbin
-root_libdir = $(root_prefix)/lib
+root_bindir = @root_bindir@
+root_sbindir = @root_sbindir@
+root_libdir = @root_libdir@
 bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
+datadir= @datadir@
+localedir = $(datadir)/locale
+root_sysconfdir= @root_sysconfdir@
 includedir = @includedir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
@@ -29,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@
@@ -61,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@
@@ -68,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@
@@ -75,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@
 
 #
@@ -109,10 +120,12 @@ $(top_builddir)/util/subst:
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=                -ansi -D_POSIX_SOURCE -pedantic \
+WFLAGS=                -ansi -D_POSIX_SOURCE -pedantic $(WFLAGS_EXTRA) \
                        -Wall -Wwrite-strings -Wpointer-arith \
-                       -Wcast-qual -Wcast-align -Wtraditional \
+                       -Wcast-qual -Wcast-align  \
                        -Wstrict-prototypes -Wmissing-prototypes \
+                       -Wformat-security  -Wformat-nonliteral \
+                       -Wmissing-format-attribute \
                        -Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow 
 
 gcc-wall-new: