Move <mcheck.h> include out of system.h to the couple of places that care

- only two real users inside rpm
- remove mcheck foo from rpminject and rpmsort, we're not interested...

lib/poptALL.c

@@ -6,6 +6,10 @@
 #include "system.h"
 const char *__progname;
 
+#if HAVE_MCHECK_H
+#include <mcheck.h>
+#endif
+
 #include <rpm/rpmcli.h>
 #include <rpm/rpmlib.h>		/* rpmEVR, rpmReadConfigFiles etc */
 #include <rpm/rpmgi.h>

rpmqv.c

@@ -12,6 +12,9 @@ const char *__progname;
 #endif
 
 #include <sys/wait.h>
+#if HAVE_MCHECK_H
+#include <mcheck.h>
+#endif
 
 #include <rpm/rpmcli.h>
 #include <rpm/rpmlib.h>			/* RPMSIGTAG, rpmReadPackageFile .. */

system.h

@@ -143,10 +143,6 @@ typedef	char * security_context_t;
 typedef void * cap_t;
 #endif
 
-#if HAVE_MCHECK_H
-#include <mcheck.h>
-#endif	/* HAVE_MCHECK_H */
-
 #include "rpmio/rpmutil.h"
 /* compatibility macros to avoid a mass-renaming all over the codebase */
 #define xmalloc(_size) rmalloc((_size))

tools/rpminject.c

@@ -455,10 +455,6 @@ main(int argc, char *argv[])
     int ec = 0;
     injmode_t lastmode = INJ_UNKNOWN;
 
-#if HAVE_MCHECK_H && HAVE_MTRACE
-    mtrace();  /* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
-#endif
-
     setprogname(argv[0]);	/* Retrofit glibc __progname */
 #if defined(ENABLE_NLS)
     (void)setlocale(LC_ALL, "" );

tools/rpmsort.c

@@ -252,9 +252,6 @@ main(int argc, char *argv[])
     };
 
 
-#if HAVE_MCHECK_H && HAVE_MTRACE
-    mtrace();	/* Trace malloc only if MALLOC_TRACE=mtrace-output-file. */
-#endif
     setprogname(argv[0]);	/* Retrofit glibc __progname */
 #if defined(ENABLE_NLS)
     (void)setlocale(LC_ALL, "" );