Rewrite signal mask decoding without sigset_t

[strace] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2f813820815d9c3dce2d1ebb80d9dcd600cabd21..caa5aeddfb61cff2d02368a2d0e12862d483bf13 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,12 @@
 dnl Process this file with autoconf to create configure.  Use autoreconf.
 AC_PREREQ(2.57)
-AC_INIT([strace],[4.7])
+AC_INIT([strace],
+       m4_esyscmd([./git-version-gen .tarball-version]),
+       [strace-devel@lists.sourceforge.net])
 AC_CONFIG_SRCDIR([strace.c])
 AC_CONFIG_AUX_DIR([.])
-AM_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([foreign check-news dist-xz no-dist-gzip silent-rules])
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE([foreign dist-xz no-dist-gzip silent-rules parallel-tests])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
@@ -52,7 +54,11 @@ alpha*)
 powerpc*)
        arch=powerpc
        AC_DEFINE([POWERPC], 1, [Define for the PowerPC architecture.])
-       if test $host_cpu = powerpc64; then
+       AC_TRY_COMPILE(
+[#ifndef __LP64__
+# error 32 bit
+#endif], [], ppc_bits=64, ppc_bits=32)
+       if test "$ppc_bits" = "64"; then
                AC_DEFINE([POWERPC64], 1, [Define for the PowerPC64 architecture.])
        fi
        ;;
@@ -68,6 +74,10 @@ avr32*)
        arch=avr32
        AC_DEFINE([AVR32], 1, [Define for the AVR32 architecture.])
        ;;
+arc*)
+       arch=arc
+       AC_DEFINE([ARC], 1, [Define for the ARC architecture.])
+       ;;
 s390)
        arch=s390
        AC_DEFINE([S390], 1, [Define for the S390 architecture.])
@@ -120,6 +130,11 @@ or1k*)
        AC_DEFINE([OR1K], 1, [Define for the OpenRISC 1000 architecture.])
        ;;
 
+xtensa*)
+       arch=xtensa
+       AC_DEFINE([XTENSA], 1, [Define for the Xtensa architecture])
+       ;;
+
 *)
        AC_MSG_RESULT([NO!])
        AC_MSG_ERROR([architecture $host_cpu is not supported by strace])
@@ -178,14 +193,12 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,,
 [#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>])
-AC_CHECK_TYPES([long long])
 AC_LITTLE_ENDIAN_LONG_LONG
-AC_OFF_T_IS_LONG_LONG
-AC_CHECK_TYPES([struct opthdr],,, [#include <sys/socket.h>])
-AC_CHECK_TYPES([struct t_opthdr],,, [#include <sys/tiuser.h>])
 
 AC_CHECK_FUNCS(m4_normalize([
+       fopen64
        fork
+       fputs_unlocked
        if_indextoname
        inet_ntop
        prctl
@@ -195,8 +208,6 @@ AC_CHECK_FUNCS(m4_normalize([
        stpcpy
        strerror
        strsignal
-       _sys_siglist
-       sys_siglist
 ]))
 AC_CHECK_HEADERS(m4_normalize([
        asm/cachectl.h
@@ -211,6 +222,7 @@ AC_CHECK_HEADERS(m4_normalize([
        mqueue.h
        netinet/sctp.h
        poll.h
+       scsi/sg.h
        stropts.h
        sys/acl.h
        sys/asynch.h
@@ -229,35 +241,26 @@ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
 #include <sys/socket.h>
 #include <asm/types.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
-AC_CHECK_TYPES([struct sigcontext_struct,
-               struct sigcontext],,, [#include <signal.h>])
+AC_CHECK_TYPES([struct sigcontext],,, [#include <signal.h>])
 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
 
 AC_CHECK_MEMBERS([struct msghdr.msg_control],,, [#include <sys/socket.h>])
 
-AC_CHECK_MEMBERS([struct T_conn_res.QUEUE_ptr,
-                  struct T_conn_res.ACCEPTOR_id],,,
-[#include <sys/stream.h>
-#include <sys/tihdr.h>])
-
 AC_CHECK_TYPES([struct __old_kernel_stat],,, [#include <asm/stat.h>])
 
-AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg],,,
+AC_CHECK_TYPES([struct pt_all_user_regs, struct ia64_fpreg, struct ptrace_peeksiginfo_args],,,
               [#include <sys/ptrace.h>])
 
 AC_CHECK_TYPES([struct user_desc],,, [#include <asm/ldt.h>])
 
-AC_CHECK_MEMBERS([struct dqblk.dqb_curblocks],,, [#include <sys/quota.h>])
+AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
 
-AC_CHECK_MEMBERS([struct sigcontext.sc_hi2],,, [#include <signal.h>
-#ifdef HAVE_ASM_SIGCONTEXT_H
-# include <asm/sigcontext.h>
-#endif])
+AC_CHECK_MEMBERS([struct sigevent._sigev_un._pad,
+                 struct sigevent.__pad],,, [#include <signal.h>])
 
-AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
+AC_CHECK_TYPES([struct flock64],,, [#include <fcntl.h>])
 
 AC_CHECK_DECLS([sys_errlist])
-AC_CHECK_DECLS([sys_siglist, _sys_siglist],,, [#include <signal.h>])
 AC_CHECK_DECLS(m4_normalize([
        PTRACE_EVENT_CLONE,
        PTRACE_EVENT_EXEC,
@@ -273,6 +276,8 @@ AC_CHECK_DECLS(m4_normalize([
        PTRACE_O_TRACEFORK,
        PTRACE_O_TRACESYSGOOD,
        PTRACE_O_TRACEVFORK,
+       PTRACE_PEEKUSER,
+       PTRACE_POKEUSER,
        PTRACE_SETOPTIONS
 ]),,, [#include <sys/ptrace.h>])
 
@@ -291,12 +296,27 @@ AC_CACHE_CHECK([for BLKGETSIZE64], [ac_cv_have_blkgetsize64],
        fi)
 
 AC_CHECK_SIZEOF([long])
+AC_CHECK_SIZEOF([long long])
 AC_CHECK_SIZEOF([rlim_t],,[#include <sys/resource.h>])
 
-AC_CHECK_HEADERS([libaio.h], [
-       AC_CHECK_MEMBERS([struct iocb.u.c.flags],,, [#include <libaio.h>])
-       AC_CHECK_DECLS([IO_CMD_PWRITE, IO_CMD_PWRITEV],,, [#include <libaio.h>])
-])
+AC_CACHE_CHECK([for SA_RESTORER], [st_cv_sa_restorer],
+              [st_cv_sa_restorer="$(echo SA_RESTORER |
+                       $CPP $CPPFLAGS -P -imacros asm/signal.h - |
+                       grep ^0x)"
+               test -n "$st_cv_sa_restorer" || st_cv_sa_restorer=no])
+if test "x$st_cv_sa_restorer" != xno; then
+       AC_DEFINE_UNQUOTED([ASM_SA_RESTORER], [$st_cv_sa_restorer],
+                          [SA_RESTORER defined in <asm/signal.h>])
+fi
+
+AC_CACHE_CHECK([for __builtin_popcount], [st_cv_have___builtin_popcount],
+              [AC_LINK_IFELSE([AC_LANG_PROGRAM([], [__builtin_popcount(0)])],
+                              [st_cv_have___builtin_popcount=yes],
+                              [st_cv_have___builtin_popcount=no])])
+if test "x$st_cv_have___builtin_popcount" = xyes; then
+       AC_DEFINE([HAVE___BUILTIN_POPCOUNT], [1],
+                 [Define to 1 if the system provides __builtin_popcount function])
+fi
 
 AC_PATH_PROG([PERL], [perl])