# HG changeset patch
# User Stu Tomlinson <nosnilmot@pidgin.im>
# Date 1178843990 0
# Node ID 55546a408134523b3c4a5c4aa94e29ea0e917f80
# Parent  51cf6aa2ca5bc78263e706f856a2b5c353b956be# Parent  f135ca1f398d2e14862be86553ede615d5a1d942
merge of '51cf6aa2ca5bc78263e706f856a2b5c353b956be'
     and 'f135ca1f398d2e14862be86553ede615d5a1d942'

diff -r 51cf6aa2ca5b -r 55546a408134 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.
diff -r 51cf6aa2ca5b -r 55546a408134 libpurple/version.h.in
diff -r 51cf6aa2ca5b -r 55546a408134 pidgin/plugins/perl/common/Pidgin.pm
diff -r 51cf6aa2ca5b -r 55546a408134 pidgin/plugins/perl/common/Pidgin.xs