/pidgin/main: bd09f4d38bb0: Merge release-2.x.y

[Tomasz Wasilczyk]

Changeset: bd09f4d38bb0670d1656d7187f2238f7bc0ec9bb
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-03-13 12:18 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/bd09f4d38bb0

Description:

Merge release-2.x.y

diffstat:

 configure.ac |  6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diffs (30 lines):

diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1477,9 +1477,7 @@ if test "x$GCC" = "xyes"; then
 		orig_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $newflag"
 		AC_MSG_CHECKING(for $newflag option to gcc)
-		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
-			int main() {return 0;}
-		]])], [
+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])], [
 			AC_MSG_RESULT(yes)
 			CFLAGS="$orig_CFLAGS"
 			DEBUG_CFLAGS="$DEBUG_CFLAGS $newflag"
@@ -1492,7 +1490,6 @@ if test "x$GCC" = "xyes"; then
 	if test "x$enable_fortify" = "xyes"; then
 		AC_MSG_CHECKING(for FORTIFY_SOURCE support)
 		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <features.h>]], [[
-			int main() {
 			#if !(__GNUC_PREREQ (4, 1) \
 				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (4, 0)) \
 				|| (defined __GNUC_RH_RELEASE__ && __GNUC_PREREQ (3, 4) \
@@ -1502,7 +1499,6 @@ if test "x$GCC" = "xyes"; then
 			#error No FORTIFY_SOURCE support
 			#endif
 				return 0;
-			}
 		]])], [
 			AC_MSG_RESULT(yes)
 			DEBUG_CFLAGS="$DEBUG_CFLAGS -Wp,-D_FORTIFY_SOURCE=2"