From a5e6a1b66d1a4c809cd5bf932184755f6172c01e Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@users.sourceforge.net>
Date: Wed, 14 Jul 2010 18:25:02 +1000
Subject: [PATCH] configure.ac fixes for peekfd on mipsel and x86_64

---
 ChangeLog     |  7 +++++++
 configure.ac  | 22 ++++++++++++++--------
 po/.gitignore |  1 +
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4cf03d5..343285f 100644
--- 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 cb796fa..ec1da94 100644
--- 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 efe855b..dbe7f63 100644
--- a/po/.gitignore
+++ b/po/.gitignore
@@ -9,3 +9,4 @@ en@quot.header
 insert-header.sin
 quot.sed
 remove-potcdate.sin
+remove-potcdate.sed
-- 
2.40.0