summaryrefslogtreecommitdiffstats
path: root/common/jpeg
diff options
context:
space:
mode:
authorDRC <dcommander@users.sourceforge.net>2010-05-17 20:57:48 +0000
committerDRC <dcommander@users.sourceforge.net>2010-05-17 20:57:48 +0000
commit50469f94cb8c90195775df025658d1526061f6fb (patch)
treec90262250727f606a5c1d4077effcefc1477c281 /common/jpeg
parent5ef6c479db46ef22290bf8ae46d122d67bae8747 (diff)
downloadtigervnc-50469f94cb8c90195775df025658d1526061f6fb.tar.gz
tigervnc-50469f94cb8c90195775df025658d1526061f6fb.zip
FreeBSD sometimes sets host_cpu to amd64 on 64-bit systems. Handle this case so --host doesn't have to be specified explicitly.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4055 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'common/jpeg')
-rw-r--r--common/jpeg/acinclude.m42
-rw-r--r--common/jpeg/configure.ac2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/jpeg/acinclude.m4 b/common/jpeg/acinclude.m4
index 570e606c..cc10a215 100644
--- a/common/jpeg/acinclude.m4
+++ b/common/jpeg/acinclude.m4
@@ -45,7 +45,7 @@ case "$host_os" in
objfmt='BSD-a.out'
else
case "$host_cpu" in
- x86_64)
+ x86_64 | amd64)
objfmt='ELF64'
;;
*)
diff --git a/common/jpeg/configure.ac b/common/jpeg/configure.ac
index 354a267e..1b4917d7 100644
--- a/common/jpeg/configure.ac
+++ b/common/jpeg/configure.ac
@@ -110,7 +110,7 @@ if test "x${with_simd}" != "xno"; then
# Check if we're on a supported CPU
AC_MSG_CHECKING([if we have SIMD optimisations for cpu type])
case "$host_cpu" in
- x86_64)
+ x86_64 | amd64)
AC_MSG_RESULT([yes (x86_64)])
AC_PROG_NASM
simd_arch=x86_64