Fix mcheck detection and usage
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
b38e046621
commit
a8731ff2f7
14
configure.ac
14
configure.ac
|
@ -174,7 +174,7 @@ AC_FUNC_STRFTIME
|
||||||
AC_FUNC_VPRINTF
|
AC_FUNC_VPRINTF
|
||||||
AC_CHECK_FUNCS([getcwd gettimeofday memmove memset mkdir realpath regcomp \
|
AC_CHECK_FUNCS([getcwd gettimeofday memmove memset mkdir realpath regcomp \
|
||||||
rmdir setenv setlocale sqrt strcasecmp strchr strdup strerror \
|
rmdir setenv setlocale sqrt strcasecmp strchr strdup strerror \
|
||||||
strndup strrchr strsep strstr strverscmp uname mtrace geteuid])
|
strndup strrchr strsep strstr strverscmp uname geteuid])
|
||||||
|
|
||||||
# Enable large file support if available
|
# Enable large file support if available
|
||||||
AC_SYS_LARGEFILE
|
AC_SYS_LARGEFILE
|
||||||
|
@ -267,20 +267,22 @@ AM_CONDITIONAL(USE_ASCIIDOC, test "x$useasciidoc" = "xyes")
|
||||||
# Enable or disable debug code
|
# Enable or disable debug code
|
||||||
AC_MSG_CHECKING(for debug mode request)
|
AC_MSG_CHECKING(for debug mode request)
|
||||||
if test "x$debug" = "xyes" ; then
|
if test "x$debug" = "xyes" ; then
|
||||||
AC_DEFINE([PACMAN_DEBUG], , [Enable debug code])
|
|
||||||
CFLAGS="$CFLAGS -g -Wall -Werror -fstack-protector-all -std=c99"
|
|
||||||
LDFLAGS="$LDFLAGS -lmcheck"
|
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE([PACMAN_DEBUG], , [Enable debug code])
|
||||||
|
# Check for mcheck
|
||||||
|
AC_CHECK_HEADERS([mcheck.h])
|
||||||
|
|
||||||
|
CFLAGS="$CFLAGS -g -Wall -Werror -fstack-protector-all -std=c99"
|
||||||
else
|
else
|
||||||
CFLAGS="$CFLAGS -Wall -std=c99"
|
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
|
CFLAGS="$CFLAGS -Wall -std=c99"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Enable or disable inclusion of abs script
|
# Enable or disable inclusion of abs script
|
||||||
AC_MSG_CHECKING(for inclusion of abs script)
|
AC_MSG_CHECKING(for inclusion of abs script)
|
||||||
if test "x$includeabs" = "xyes" ; then
|
if test "x$includeabs" = "xyes" ; then
|
||||||
AC_DEFINE([INCLUDE_ABS], , [Include abs script])
|
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
|
AC_DEFINE([INCLUDE_ABS], , [Include abs script])
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT(no)
|
AC_MSG_RESULT(no)
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <sys/utsname.h> /* uname */
|
#include <sys/utsname.h> /* uname */
|
||||||
#include <locale.h> /* setlocale */
|
#include <locale.h> /* setlocale */
|
||||||
#include <time.h> /* time_t */
|
#include <time.h> /* time_t */
|
||||||
#if defined(PACMAN_DEBUG) && defined(HAVE_MTRACE)
|
#if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H)
|
||||||
#include <mcheck.h> /* debug tracing (mtrace) */
|
#include <mcheck.h> /* debug tracing (mtrace) */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -720,7 +720,7 @@ int main(int argc, char *argv[])
|
||||||
uid_t myuid = geteuid();
|
uid_t myuid = geteuid();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(PACMAN_DEBUG) && defined(HAVE_MTRACE)
|
#if defined(PACMAN_DEBUG) && defined(HAVE_MCHECK_H)
|
||||||
/*setenv("MALLOC_TRACE","pacman.mtrace", 0);*/
|
/*setenv("MALLOC_TRACE","pacman.mtrace", 0);*/
|
||||||
mtrace();
|
mtrace();
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue