diff options
author | joerg <joerg> | 2006-03-01 16:44:28 +0000 |
---|---|---|
committer | joerg <joerg> | 2006-03-01 16:44:28 +0000 |
commit | 29dc3a9a6f55026d5d4f4c3b7b2ab5b25317de4f (patch) | |
tree | cfa90cdcff9e1e2782e65ba856ddab73799f74eb /pkgtools | |
parent | b39fd60d83a4c8574d5549db07284638eeab185e (diff) | |
download | pkgsrc-29dc3a9a6f55026d5d4f4c3b7b2ab5b25317de4f.tar.gz |
Update AC_C___ATTRIBUTE__ macro with newer version on Heimdal,
the old one is just bogus and depends on GCC extensions. Unbreaks
GCC 4 build.
Diffstat (limited to 'pkgtools')
-rw-r--r-- | pkgtools/digest/files/aclocal.m4 | 17 | ||||
-rwxr-xr-x | pkgtools/digest/files/configure | 9 |
2 files changed, 7 insertions, 19 deletions
diff --git a/pkgtools/digest/files/aclocal.m4 b/pkgtools/digest/files/aclocal.m4 index d69553e2d4c..ac5b591a4d9 100644 --- a/pkgtools/digest/files/aclocal.m4 +++ b/pkgtools/digest/files/aclocal.m4 @@ -1,20 +1,17 @@ -dnl $Id: aclocal.m4,v 1.1 2002/12/21 04:06:13 schmonz Exp $ +dnl $Id: aclocal.m4,v 1.2 2006/03/01 16:44:28 joerg Exp $ dnl From heimdal sources -dnl Id: c-attribute.m4,v 1.2 1999/03/01 09:52:23 joda Exp +dnl Id: c-attribute.m4,v 1.5 2004/08/26 12:35:41 joda Exp dnl dnl dnl Test for __attribute__ dnl -AC_DEFUN(AC_C___ATTRIBUTE__, [ +AC_DEFUN([AC_C___ATTRIBUTE__], [ AC_MSG_CHECKING(for __attribute__) AC_CACHE_VAL(ac_cv___attribute__, [ -AC_TRY_COMPILE([ -#include <stdlib.h> -], -[ +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[#include <stdlib.h> static void foo(void) __attribute__ ((noreturn)); static void @@ -22,9 +19,9 @@ foo(void) { exit(1); } -], -ac_cv___attribute__=yes, -ac_cv___attribute__=no)]) +]])], +[ac_cv___attribute__=yes], +[ac_cv___attribute__=no])]) if test "$ac_cv___attribute__" = "yes"; then AC_DEFINE(HAVE___ATTRIBUTE__, 1, [define if your compiler has __attribute__]) fi diff --git a/pkgtools/digest/files/configure b/pkgtools/digest/files/configure index 1574667b48e..5b9bd694b6d 100755 --- a/pkgtools/digest/files/configure +++ b/pkgtools/digest/files/configure @@ -3465,13 +3465,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - #include <stdlib.h> - -int -main () -{ - static void foo(void) __attribute__ ((noreturn)); static void @@ -3480,9 +3474,6 @@ foo(void) exit(1); } - ; - return 0; -} _ACEOF rm -f conftest.$ac_objext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 |