merge of '51cf6aa2ca5bc78263e706f856a2b5c353b956be'

Fri, 11 May 2007 00:39:50 +0000

author
Stu Tomlinson <nosnilmot@pidgin.im>
date
Fri, 11 May 2007 00:39:50 +0000
changeset 17074
55546a408134
parent 17073
51cf6aa2ca5b (current diff)
parent 16591
f135ca1f398d (diff)
child 17075
39f6369e428c

merge of '51cf6aa2ca5bc78263e706f856a2b5c353b956be'
and 'f135ca1f398d2e14862be86553ede615d5a1d942'

PROGRAMMING_NOTES file | annotate | diff | comparison | revisions
configure.ac file | annotate | diff | comparison | revisions
libpurple/version.h file | annotate | diff | comparison | revisions
libpurple/version.h.in file | annotate | diff | comparison | revisions
pidgin/pixmaps/about_menu.png file | annotate | diff | comparison | revisions
pidgin/plugins/perl/common/GtkUI.pm file | annotate | diff | comparison | revisions
pidgin/plugins/perl/common/GtkUI.xs file | annotate | diff | comparison | revisions
pidgin/plugins/perl/common/Pidgin.pm file | annotate | diff | comparison | revisions
pidgin/plugins/perl/common/Pidgin.xs file | annotate | diff | comparison | revisions
--- 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.

mercurial