[COVERITY] Fix memory leak in libss (ss_execute_line)

[tools/e2fsprogs.git] / MCONFIG.in

diff --git a/MCONFIG.in b/MCONFIG.in
index 991aaa0..c3e7685 100644 (file)
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -14,6 +14,7 @@ exec_prefix = @exec_prefix@
 root_bindir = @root_bindir@
 root_sbindir = @root_sbindir@
 root_libdir = @root_libdir@
+datarootdir = @datarootdir@
 bindir = @bindir@
 sbindir = @sbindir@
 libdir = @libdir@
@@ -24,6 +25,7 @@ includedir = @includedir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 man3dir = $(mandir)/man3
+man5dir = $(mandir)/man5
 man8dir = $(mandir)/man8
 infodir = @infodir@
 datadir = @datadir@
@@ -32,7 +34,7 @@ datadir = @datadir@
 
 CC = @CC@
 BUILD_CC = @BUILD_CC@
-DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
+DEFS = -DLOCALEDIR=\"$(localedir)\" -DROOT_SYSCONFDIR=\"$(root_sysconfdir)\" @DEFS@
 CFLAGS = @CFLAGS@
 CPPFLAGS =  -I$(top_builddir)/lib -I$(top_srcdir)/lib @CPPFLAGS@
 INTL_FLAGS = @INTL_FLAGS@
@@ -66,6 +68,9 @@ MKINSTALLDIRS = @MKINSTALLDIRS@
 #
 # Library definitions
 #
+DEVMAPPER_LIBS = @DEVMAPPER_LIBS@
+STATIC_DEVMAPPER_LIBS = @STATIC_DEVMAPPER_LIBS@
+
 LIB = $(top_builddir)/lib
 LIBSS = $(LIB)/libss@LIB_EXT@
 LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@
@@ -75,14 +80,16 @@ LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
 LIBBLKID = $(LIB)/libblkid@LIB_EXT@
 LIBINTL = @LIBINTL@
 DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
+DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@
 
 STATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 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@
+STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
 DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
+DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
 
 PROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
 PROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
@@ -91,6 +98,7 @@ 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@
+DEPPROFILED_LIBBLKID = $(LIB)/libblkid@PROFILED_LIB_EXT@
 
 # An include directive pointing to a directory holding enough linux-like
 # include files to satisfy some programs here
@@ -113,12 +121,13 @@ $(top_builddir)/util/subst:
 # Run make gcc-wall to do a build with warning messages.
 #
 #
-WFLAGS=                -ansi -D_POSIX_SOURCE -pedantic $(WFLAGS_EXTRA) \
+WFLAGS=                -std=c99 -D_XOPEN_SOURCE=600 -D_GNU_SOURCE \
+                       -pedantic $(WFLAGS_EXTRA) \
                        -Wall -W -Wwrite-strings -Wpointer-arith \
-                       -Wcast-qual -Wcast-align  \
+                       -Wcast-qual -Wcast-align -Wno-variadic-macros \
                        -Wstrict-prototypes -Wmissing-prototypes \
                        -Wformat-security  -Wformat-nonliteral \
-                       -Wmissing-format-attribute \
+                       -Wmissing-format-attribute -O2 -Wstrict-aliasing \
                        -Wnested-externs -Winline -DNO_INLINE_FUNCS -Wshadow \
                        -UENABLE_NLS