From: DRC <dcommander@users.sourceforge.net>
Date: Mon, 17 May 2010 20:47:57 +0000 (+0000)
Subject: 64-bit FreeBSD sets host_cpu to "amd64", not "x86_64".  Handle that case so that... 
X-Git-Tag: 1.0.0~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49597877a4f85f6648d4fb036ae291d7166f88df;p=libjpeg-turbo

64-bit FreeBSD sets host_cpu to "amd64", not "x86_64".  Handle that case so that configure will work without explicitly specifying --host.


git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@190 632fc199-4ca6-4c93-a231-07263d6284db
---

diff --git a/BUILDING.txt b/BUILDING.txt
index 520acb8..fae1a8a 100644
--- a/BUILDING.txt
+++ b/BUILDING.txt
@@ -35,9 +35,9 @@ Build Requirements
 Building libjpeg-turbo
 ======================
 
-The following procedure will build libjpeg-turbo on Linux, 32-bit OS X, and
-Solaris/x86 systems (on Solaris, this generates a 32-bit library.  See below
-for 64-bit build instructions.)
+The following procedure will build libjpeg-turbo on Linux, FreeBSD, 32-bit
+OS X, and Solaris/x86 systems (on Solaris, this generates a 32-bit library.
+See below for 64-bit build instructions.)
 
   cd libjpeg-turbo
   autoreconf -fiv
@@ -163,17 +163,6 @@ Add
 to the configure command line.
 
 
-64-bit Library Build on 64-bit FreeBSD
---------------------------------------
-
-Add
-
-  --host x86_64-unknown-freebsd
-
-to the configure command line.  NASM 2.07 or later from FreeBSD ports must be
-installed.
-
-
 32-bit Library Build on 64-bit FreeBSD
 --------------------------------------
 
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 97c884e..b4fac26 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+Significant changes since 0.0.93
+================================
+
+[1] Further FreeBSD build tweaks (no longer necessary to specify --host
+when configuring on a 64-bit system)
+
+
 Significant changes since 0.0.91
 ================================
 
diff --git a/acinclude.m4 b/acinclude.m4
index 570e606..cc10a21 100644
--- a/acinclude.m4
+++ b/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/configure.ac b/configure.ac
index b8f6179..dc0a9de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -133,7 +133,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
@@ -157,7 +157,7 @@ fi
 AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
 AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"])
 AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"])
-AM_CONDITIONAL([X86_64], [test "x$host_cpu" = "xx86_64"])
+AM_CONDITIONAL([X86_64], [test "x$host_cpu" = "xx86_64" -o "x$host_cpu" = "xamd64"])
 
 case "$host_cpu" in
   x86_64)