configure.ac fixes for peekfd on mipsel and x86_64

diff --git a/ChangeLog b/ChangeLog
index 4cf03d5dc4728280f9c2862ce5ea77125687e063..343285fa94a3b0ca423095fc48d06dfb01f5a5c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Changes in 22.13
+================
+       * configure patch for x86_64 properly applied SF#3029302 by snowman123
+       * patch configure so pt_regs isn't used on SuperH. Fix by
+         Nobuhiro Iwamatsu in Debian #588986
+       * Fixed configure.ac so only mipsel not mips compiles peekfd
+
 Changes in 22.12
 ================
        * In fuser, switched the ipv6 and ipv4 checks around Debian #581604

diff --git a/configure.ac b/configure.ac
index cb796fa698ff30b3f17a6cde499cf1388e3fd63c..ec1da94b7e7b50d1b9864fcf7ffc265ad2d8557a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.61)
-AC_INIT([psmisc],[22.12])
+AC_INIT([psmisc],[22.13])
 AC_CONFIG_SRCDIR([src/comm.h])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_AUX_DIR([config])
@@ -56,6 +56,12 @@ AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_CHECK_MEMBERS([struct stat.st_rdev])
 AC_TYPE_UID_T
+
+dnl Check for language stuff
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.16.1])
+
+dnl Must be after the gettext stuff as it sets build_cpu
 AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
                struct user_regs_struct.eax,
                struct user_regs_struct.ebx,
@@ -66,11 +72,13 @@ AC_CHECK_MEMBERS([struct user_regs_struct.orig_eax,
                struct user_regs_struct.rdi,
                struct user_regs_struct.rsi,
                struct user_regs_struct.rdx], [],[],
-    [#include <sys/user.h>])
+    [#include <bits/types.h>
+     #include <sys/user.h>])
 AC_CHECK_MEMBERS([struct pt_regs.orig_gpr3,
                struct pt_regs.gpr], [],[], [#include <linux/ptrace.h>])
 AC_CHECK_MEMBERS([struct pt_regs.uregs],[],[], [#include <asm/ptrace.h>])
-AC_CHECK_MEMBERS([struct pt_regs.regs],[],[], [#include <asm/ptrace.h>])
+AC_CHECK_MEMBERS([struct pt_regs.regs,
+                  struct pt_regs.cp0_status],[],[], [#include <asm/ptrace.h>])
 
 AM_CONDITIONAL(WANT_PEEKFD_I386,
  test $ac_cv_member_struct_user_regs_struct_orig_eax = yes &&
@@ -90,11 +98,9 @@ AM_CONDITIONAL(WANT_PEEKFD_PPC,
 AM_CONDITIONAL(WANT_PEEKFD_ARM,
    test $ac_cv_member_struct_pt_regs_uregs = yes)
 AM_CONDITIONAL(WANT_PEEKFD_MIPS,
-   test $ac_cv_member_struct_pt_regs_regs = yes)
-
-dnl Check for language stuff
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.16.1])
+   test $build_cpu = mipsel &&
+   test $ac_cv_member_struct_pt_regs_regs = yes &&
+   test $ac_cv_member_struct_pt_regs_cp0_status = yes)
 
 dnl Checks for library functions.
 AC_FUNC_CLOSEDIR_VOID

diff --git a/po/.gitignore b/po/.gitignore
index efe855b0631792d81b36f5f4e9b46cbdd348e2a4..dbe7f63e82cb9b33130914b03b737e573674fd43 100644 (file)
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -9,3 +9,4 @@ en@quot.header
 insert-header.sin
 quot.sed
 remove-potcdate.sin
+remove-potcdate.sed