diff options
| -rw-r--r-- | BUILDING.txt | 17 | ||||
| -rw-r--r-- | ChangeLog.txt | 7 | ||||
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
4 files changed, 13 insertions, 17 deletions
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) |