summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorKaroly Lorentey <lorentey@elte.hu>2006-03-04 23:07:13 +0000
committerKaroly Lorentey <lorentey@elte.hu>2006-03-04 23:07:13 +0000
commit00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d (patch)
tree875ed4fe8e87a4a52d5ea46140b3c70487847c81 /configure
parentbdf36482bbea390390ae7ab1461b14b807c4fb1f (diff)
parent5e9edb94b78ef77981213fca9319d591c7362855 (diff)
downloademacs-00bc10dab1f80e3fcf1b8e67dd7618c32ae3926d.tar.gz
Merged from emacs@sv.gnu.org
Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-128 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-129 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-130 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-131 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-132 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-133 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-134 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-135 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-43 Munge arch explicit ids in etc/images to match Emacs * emacs@sv.gnu.org/gnus--rel--5.10--patch-44 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-45 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-46 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-47 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-48 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-524
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure3
1 files changed, 3 insertions, 0 deletions
diff --git a/configure b/configure
index 9c9bf68eb53..fb8ca620365 100755
--- a/configure
+++ b/configure
@@ -2136,6 +2136,9 @@ _ACEOF
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
;;