diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2012-08-30 23:48:39 +0200 |
| commit | a8b134d8c667b0105d7194a78f3fe478a3857302 (patch) | |
| tree | 94da06519d2a623ce4e7aee21fd7b32ffecfea59 /configure.ac | |
| parent | 013f554871c671f88942c9429720d3bb9a76c5ea (diff) | |
| parent | 0096579c8bea920f7c42b40ea22db621da6480a5 (diff) | |
Merge commit 'refs/top-bases/t/stand-alone' into t/stand-alonet/stand-alone
Conflicts:
Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 894c91d..2130547 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2009 Free Software Foundation, Inc. +# Copyright (C) 2009, 2012 Free Software Foundation, Inc. # # This file is part of the POSIX threading library. # @@ -43,21 +43,16 @@ AC_CHECK_LIB([ihash], [hurd_ihash_create], [:], AC_GNU_SOURCE AC_CANONICAL_HOST -[arch_ia32=false -arch_powerpc=false +[arch_i386=false case $host_cpu in i386 | i486 | i586 | i686) - arch_ia32=true - ;; - powerpc) - arch_powerpc=true + arch_i386=true ;; *)] AC_MSG_ERROR([unsupported architecture]) [;; esac] -AM_CONDITIONAL([ARCH_IA32], [$arch_ia32]) -AM_CONDITIONAL([ARCH_POWERPC], [$arch_powerpc]) +AM_CONDITIONAL([ARCH_I386], [$arch_i386]) [os_gnu=false case $host_os in gnu*) @@ -68,7 +63,6 @@ case $host_os in [;; esac] AM_CONDITIONAL([OS_GNU], [$os_gnu]) -AM_CONDITIONAL([OS_L4], [false]) AM_CONDITIONAL([ENABLE_TESTS], [false]) |