Recognize more architecture names.

diff --git a/ChangeLog b/ChangeLog
index d0c6776..4936022 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2008-12-26  Bruno Haible  <bruno@clisp.org>
 
+       * m4/multiarch.m4 (gl_MULTIARCH): Recognize also the architecture names
+       i486, i586, i686.
+
+2008-12-26  Bruno Haible  <bruno@clisp.org>
+
        * lib/stdlib.in.h (struct random_data): Fix indentation of comments.
 
 2008-12-26  Bruno Haible  <bruno@clisp.org>

diff --git a/m4/multiarch.m4 b/m4/multiarch.m4
index fa03cee..d857599 100644 (file)
--- a/m4/multiarch.m4
+++ b/m4/multiarch.m4
@@ -1,4 +1,4 @@
-# multiarch.m4 serial 1
+# multiarch.m4 serial 2
 dnl Copyright (C) 2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -38,7 +38,7 @@ AC_DEFUN([gl_MULTIARCH],
      for word in ${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS}; do
        if test -n "$prev"; then
          case $word in
-           i386 | x86_64 | ppc | ppc64)
+           i?86 | x86_64 | ppc | ppc64)
              if test -z "$arch" || test "$arch" = "$word"; then
                arch="$word"
              else