Better detection of ppc64 et al

CVS patchset: 5916
CVS date: 2002/12/06 02:04:31

diff --git a/configure.ac b/configure.ac
index 4fc8589e7b57a26ef75db17d994ab1eb16039452..04268de0f5a590ce7413162f4100f57fa2fc7e5e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1108,7 +1108,7 @@ fi
 dnl XXX Choose /usr/lib or /usr/lib64 for library installs.
 MARK64=
 case "${target_cpu}" in
-x86_64*)       MARK64=64 ;;
+x86_64*|ppc64*|powerpc64*|s390x*)      MARK64=64 ;;
 esac
 AC_SUBST(MARK64)
 
@@ -1119,8 +1119,10 @@ x86_64*) RPMCANONARCH=x86_64 ;;
 alpha*)                RPMCANONARCH=alpha ;;
 sparc*)                RPMCANONARCH=sparc ;;
 ia64*)         RPMCANONARCH=ia64 ;;
+s390x*)                RPMCANONARCH=s390x ;;
 s390*)         RPMCANONARCH=s390 ;;
-powerpc*)      RPMCANONARCH=ppc ;;
+powerpc64*|ppc64*)     RPMCANONARCH=ppc64 ;;
+powerpc*|ppc*) RPMCANONARCH=ppc ;;
 armv3l*)       RPMCANONARCH=armv3l ;;
 armv4l*)       RPMCANONARCH=armv4l ;;
 armv4b*)       RPMCANONARCH=armv4b ;;