# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1178843990 0
# Node ID a0ab4040a8574c566a6db076b893a2bfeedb84f4
# Parent  6502a3ce2473800dfc6a1dd7ce3f41090cc971e3# Parent  d603b5fb729280b8d9429ed163fdee503ba9bec4
merge of '39d6b45f621cf10ca62fd25c946907b85626476f'
     and 'c6c43439075d966d927b8a85f6934e02c0d2bb1e'

diff -r 6502a3ce2473 -r a0ab4040a857 configure.ac
--- a/configure.ac	Fri May 11 00:36:25 2007 +0000
+++ b/configure.ac	Fri May 11 00:39:50 2007 +0000
@@ -905,22 +905,7 @@
 AC_CHECK_HEADER(sys/utsname.h)
 AC_CHECK_FUNC(uname)
 
-AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], enable_fortify="$enableval", enable_fortify=yes)
-
-AC_ARG_ENABLE(mcheck, [AC_HELP_STRING([--enable-mcheck], [compile with mcheck (malloc debugging) support])], enable_mcheck="$enableval", enable_mcheck="$enable_debug")
-if test "x$enable_mcheck" = "xyes" ; then
-	orig_LIBS="$LIBS"
-	LIBS="$LIBS -lmcheck"
-	AC_MSG_CHECKING(for mcheck support)
-	AC_TRY_COMPILE([], [
-		int main() {return 0;}
-	], [
-		AC_MSG_RESULT(yes)
-	], [
-		AC_MSG_RESULT(no)
-		LIBS="$orig_LIBS"
-	])
-fi
+AC_ARG_ENABLE(fortify, [AC_HELP_STRING([--disable-fortify], [compile without FORTIFY_SOURCE support])], , enable_fortify=yes)
 
 if test "x$GCC" = "xyes"; then
 	dnl We enable -Wall later.