changeset 17030:a0ab4040a857

merge of '39d6b45f621cf10ca62fd25c946907b85626476f' and 'c6c43439075d966d927b8a85f6934e02c0d2bb1e'
author Stu Tomlinson <stu@nosnilmot.com>
date Fri, 11 May 2007 00:39:50 +0000
parents 6502a3ce2473 (current diff) d603b5fb7292 (diff)
children 220b1e21d336
files PROGRAMMING_NOTES configure.ac libpurple/version.h pidgin/pixmaps/about_menu.png pidgin/plugins/perl/common/GtkUI.pm pidgin/plugins/perl/common/GtkUI.xs
diffstat 1 files changed, 1 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- 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.