From cc7b4554cb9a83af147eaf19913a3427b6d84c2a Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 13 Jan 2009 06:19:47 +0000 Subject: [PATCH] The problem of the detection of __attribute__ on mac os x comes from the fact that we put a definition of a function in the body of main(). Moving it outside fixes it. In addition, the extra flag i added in configure.ac is useless. SVN revision: 38565 --- legacy/eina/configure.ac | 3 --- legacy/eina/m4/ac_attribute.m4 | 18 ++---------------- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index 2f9d8063eb..04c9da0fba 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -273,9 +273,6 @@ case "${host_os}" in mingw*) EINA_CFLAGS="${EINA_CFLAGS} ${EVIL_CFLAGS}" ;; - darwin*) - EINA_CFLAGS="${EINA_CFLAGS} -fnested-functions" - ;; esac if test "x$enable_coverage" = "xyes" ; then diff --git a/legacy/eina/m4/ac_attribute.m4 b/legacy/eina/m4/ac_attribute.m4 index 053ea55008..5b8c1e2437 100644 --- a/legacy/eina/m4/ac_attribute.m4 +++ b/legacy/eina/m4/ac_attribute.m4 @@ -17,37 +17,23 @@ AC_DEFUN([AC_C___ATTRIBUTE__], AC_MSG_CHECKING([for __attribute__]) -dnl On mac os x, error of compilation without -fnested-functions -case "${host_os}" in - darwin*) - CFLAGS_SAVE=${CFLAGS} - CFLAGS="${CFLAGS} -fnested-functions" - ;; -esac - AC_CACHE_VAL([ac_cv___attribute__], [AC_TRY_COMPILE( [ #include - ], - [ + int func(int x); int foo(int x __attribute__ ((unused))) { exit(1); } ], + [], [ac_cv___attribute__="yes"], [ac_cv___attribute__="no"] )] ) -case "${host_os}" in - darwin*) - CFLAGS=${CFLAGS_SAVE} - ;; -esac - AC_MSG_RESULT($ac_cv___attribute__) if test "x${ac_cv___attribute__}" = "xyes" ; then