Merged from

Patches applied:

 * [email protected]/emacs--devo--0--patch-73
   Merge from erc--emacs--0

 * [email protected]/emacs--devo--0--patch-74
   Update from CVS

 * [email protected]/emacs--devo--0--patch-75
   Make ERC comply with the new copyright year guidelines.

 * [email protected]/emacs--devo--0--patch-76
   Update from CVS

 * [email protected]/emacs--devo--0--patch-77
   Update from CVS

 * [email protected]/emacs--devo--0--patch-78
   Update from CVS

 * [email protected]/emacs--devo--0--patch-79
   (rcirc-format-response-string): Fix small bugs

 * [email protected]/emacs--devo--0--patch-80
   Update from CVS

 * [email protected]/emacs--devo--0--patch-81
   Update from CVS

 * [email protected]/emacs--devo--0--patch-82
   Fix compiler error in erc-dcc.el.

 * [email protected]/emacs--devo--0--patch-83
   Update from CVS

 * [email protected]/emacs--devo--0--patch-84
   Update from CVS

 * [email protected]/emacs--devo--0--patch-85
   Update from CVS

 * [email protected]/emacs--devo--0--patch-86
   Update from CVS

 * [email protected]/emacs--devo--0--patch-87
   Update from CVS

 * [email protected]/emacs--devo--0--patch-88
   Merge from erc--emacs--0

 * [email protected]/emacs--devo--0--patch-89
   Update from CVS

 * [email protected]/emacs--devo--0--patch-90
   Update from CVS

git-archimport-id: [email protected]/emacs--multi-tty--0--patch-513

1 files changed, 3 insertions, 0 deletions

diff --git a/configure.in b/configure.in
index d86b55afa4..9f286f290e 100644
--- a/configure.in
+++ b/configure.in
@@ -654,6 +654,9 @@ dnl see the `changequote' comment above.
   s390-*-linux-gnu* )
     machine=ibms390 opsys=gnu-linux
   ;;
+  s390x-*-linux-gnu* )
+    machine=ibms390x opsys=gnu-linux
+  ;;
   rs6000-ibm-aix3.1* | powerpc-ibm-aix3.1*  )
     machine=ibmrs6000 opsys=aix3-1
   ;;