diff options
Diffstat (limited to 'contrib/tcpdump/aclocal.m4')
| -rw-r--r-- | contrib/tcpdump/aclocal.m4 | 36 |
1 files changed, 32 insertions, 4 deletions
diff --git a/contrib/tcpdump/aclocal.m4 b/contrib/tcpdump/aclocal.m4 index 4f99be4..06eca60 100644 --- a/contrib/tcpdump/aclocal.m4 +++ b/contrib/tcpdump/aclocal.m4 @@ -1,4 +1,4 @@ -dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.67.2.1 2000/01/25 18:39:02 itojun Exp $ (LBL) +dnl @(#) $Header: /tcpdump/master/tcpdump/aclocal.m4,v 1.73 2001/01/02 22:18:27 guy Exp $ (LBL) dnl dnl Copyright (c) 1995, 1996, 1997, 1998 dnl The Regents of the University of California. All rights reserved. @@ -192,7 +192,7 @@ AC_DEFUN(AC_LBL_LIBPCAP, libpcap=FAIL lastdir=FAIL places=`ls .. | sed -e 's,/$,,' -e 's,^,../,' | \ - egrep '/libpcap-[[0-9]]*\.[[0-9]]*(\.[[0-9]]*)?([[ab]][[0-9]]*)?$'` + egrep '/libpcap-[[0-9]]*.[[0-9]]*(.[[0-9]]*)?([[ab]][[0-9]]*)?$'` for dir in $places ../libpcap libpcap ; do basedir=`echo $dir | sed -e 's/[[ab]][[0-9]]*$//'` if test $lastdir = $basedir ; then @@ -215,7 +215,7 @@ AC_DEFUN(AC_LBL_LIBPCAP, else $1=$libpcap if test -r $d/pcap.h; then - $2="-I$d $$2" + $2="-I$d $$2" elif test -r $srcdir/../libpcap/pcap.h; then $2="-I$d -I$srcdir/../libpcap $$2" else @@ -491,7 +491,8 @@ AC_DEFUN(AC_LBL_UNALIGNED_ACCESS, AC_CACHE_VAL(ac_cv_lbl_unaligned_fail, [case "$target_cpu" in - alpha|hp*|mips|sparc) + # XXX: should also check that they don't do weird things (like on arm) + alpha*|arm*|hp*|mips|sparc) ac_cv_lbl_unaligned_fail=yes ;; @@ -1027,3 +1028,30 @@ AC_DEFUN(AC_VAR_H_ERRNO, [ AC_DEFINE(HAVE_H_ERRNO) fi ]) + +dnl +dnl Test for __attribute__ +dnl + +AC_DEFUN(AC_C___ATTRIBUTE__, [ +AC_MSG_CHECKING(for __attribute__) +AC_CACHE_VAL(ac_cv___attribute__, [ +AC_TRY_COMPILE([ +#include <stdlib.h> +], +[ +static void foo(void) __attribute__ ((noreturn)); + +static void +foo(void) +{ + exit(1); +} +], +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 +AC_MSG_RESULT($ac_cv___attribute__) +]) |
