[glib/glib-2-40] configure.ac: fix nested functions in checks
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-40] configure.ac: fix nested functions in checks
- Date: Sat, 20 Sep 2014 20:37:40 +0000 (UTC)
commit 24d26e0709d88c8f943bf79a61c55b712d500326
Author: Ryan Lortie <desrt desrt ca>
Date: Fri Jun 20 14:43:26 2014 -0400
configure.ac: fix nested functions in checks
This is a combination of these commits from master:
9362a1b2d987125a8aa0723b916d29aaaece329a
20e709d8b92e28d162c78b147afe4040e3a48b85
e15ba53cdab91587721a38efa4eeea9acf871860
configure.ac | 19 ++++---------------
1 files changed, 4 insertions(+), 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9ad8f42..7211fd8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2383,13 +2383,7 @@ AC_CACHE_CHECK(for futex(2) system call,
#include <sys/syscall.h>
#include <unistd.h>
],[
-int
-main (void)
-{
- /* it is not like this actually runs or anything... */
syscall (__NR_futex, NULL, FUTEX_WAKE, FUTEX_WAIT);
- return 0;
-}
])],glib_cv_futex=yes,glib_cv_futex=no))
if test x"$glib_cv_futex" = xyes; then
AC_DEFINE(HAVE_FUTEX, 1, [we have the futex(2) system call])
@@ -2400,12 +2394,7 @@ AC_CACHE_CHECK(for eventfd(2) system call,
#include <sys/eventfd.h>
#include <unistd.h>
],[
-int
-main (void)
-{
eventfd (0, EFD_CLOEXEC);
- return 0;
-}
])],glib_cv_eventfd=yes,glib_cv_eventfd=no))
if test x"$glib_cv_eventfd" = x"yes"; then
AC_DEFINE(HAVE_EVENTFD, 1, [we have the eventfd(2) system call])
@@ -3451,7 +3440,7 @@ AC_ARG_ENABLE(Bsymbolic,
[SAVED_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
LDFLAGS=-Wl,-Bsymbolic-functions
- AC_TRY_LINK([], [int main (void) { return 0; }],
+ AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
enable_Bsymbolic=yes,
AC_MSG_RESULT(no)
@@ -3478,14 +3467,14 @@ AC_ARG_ENABLE([znodelete],
[SAVED_LDFLAGS="${LDFLAGS}"
AC_MSG_CHECKING([for --fatal-warnings linker flag])
LDFLAGS=-Wl,--fatal-warnings
- AC_TRY_LINK([], [int main (void) { return 0; }],
+ AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
[ldflags_fatal=-Wl,--fatal-warnings],
AC_MSG_RESULT(no)
ldflags_fatal=)
AC_MSG_CHECKING([for -z,nodelete linker flag])
LDFLAGS="$ldflags_fatal -Wl,-z,nodelete"
- AC_TRY_LINK([], [int main (void) { return 0; }],
+ AC_TRY_LINK([], [return 0],
AC_MSG_RESULT(yes)
enable_znodelete=yes,
AC_MSG_RESULT(no)
@@ -3515,7 +3504,7 @@ case "$host" in
SAVED_CFLAGS="${CFLAGS}"
CFLAGS="-fvisibility=hidden"
AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
- AC_TRY_COMPILE([], [int main (void) { return 0; }],
+ AC_TRY_COMPILE([], [return 0],
AC_MSG_RESULT(yes)
enable_fvisibility_hidden=yes,
AC_MSG_RESULT(no)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]