Make SIMD build compulsory (otherwise, what's the point?)

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

diff --git a/Makefile.am b/Makefile.am
index fa45db7b90fa356487aa5a7ab8a0545785bb54fd..8545a1af2895214d3be7f338d49e336fb6abf9f4 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,19 +16,10 @@ libjpeg_la_SOURCES = $(HDRS) jcapimin.c jcapistd.c jccoefct.c jccolor.c \
 
 libturbojpeg_la_SOURCES = $(libjpeg_la_SOURCES) turbojpegl.c turbojpeg.h
 
-if WITH_SIMD
-
 SUBDIRS = simd
 libjpeg_la_LIBADD = simd/libsimd.la
 libturbojpeg_la_LIBADD = simd/libsimd.la
 
-else
-
-libjpeg_la_SOURCES += jsimd_none.c
-libturbojpeg_la_SOURCES += jsimd_none.c
-
-endif
-
 TSTHDRS = rrutil.h rrtimer.h
 
 noinst_PROGRAMS = jpgtest jpegut cjpeg djpeg

diff --git a/configure.ac b/configure.ac
index 0b371329a727d3d0efd9bc1ba6a519a44552803c..b54b8f3c5ce252655abeba1c250d8e3599a5521e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,35 +82,25 @@ case "$host_os" in
 esac
 AM_CONDITIONAL([IS_WIN32], [test "x$is_win32" = "x1"])
 
-# SIMD is optional
-AC_ARG_WITH([simd],
-    AC_HELP_STRING([--without-simd],[Omit accelerated SIMD routines.]))
-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)
-      AC_MSG_RESULT([yes (x86_64)])
-      AC_PROG_NASM
-      simd_arch=x86_64
-    ;;
-    i*86 | x86 | ia32)
-      AC_MSG_RESULT([yes (i386)])
-      AC_PROG_NASM
-      simd_arch=i386
-    ;;
-    *)
-      AC_MSG_RESULT([no ("$host_cpu")])
-      with_simd=no
-    ;;
-  esac
-
-  if test "x${with_simd}" != "xno"; then
-    AC_DEFINE([WITH_SIMD], [1], [Use accelerated SIMD routines.])
-  fi
-fi
-
-AM_CONDITIONAL([WITH_SIMD], [test "x$with_simd" != "xno"])
+# 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)
+    AC_MSG_RESULT([yes (x86_64)])
+    AC_PROG_NASM
+    simd_arch=x86_64
+  ;;
+  i*86 | x86 | ia32)
+    AC_MSG_RESULT([yes (i386)])
+    AC_PROG_NASM
+    simd_arch=i386
+  ;;
+  *)
+    AC_MSG_RESULT([no ("$host_cpu")])
+    AC_MSG_ERROR([CPU is not supported])
+  ;;
+esac
+
 AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"])
 AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"])