--- configure	2014-03-04 13:44:57.000000000 -0500
+++ configure	2015-03-04 18:44:34.000000000 -0500
@@ -3639,5 +3639,4 @@
 fi
 
-if test "$have_sse" = "yes"; then have_sse2=yes; fi
 if test "$have_sse2" = "yes"; then
 
--- configure.ac	2014-03-04 13:38:10.000000000 -0500
+++ configure.ac	2015-03-04 18:46:31.000000000 -0500
@@ -115,5 +115,4 @@
 
 AC_ARG_ENABLE(sse2, [AC_HELP_STRING([--enable-sse2],[enable SSE/SSE2 optimizations])], have_sse2=$enableval, have_sse2=no)
-if test "$have_sse" = "yes"; then have_sse2=yes; fi
 if test "$have_sse2" = "yes"; then
 	AC_DEFINE(HAVE_SSE2,1,[Define to enable SSE/SSE2 optimizations.])
--- rdft/simd/Makefile.in	2014-03-04 13:45:00.000000000 -0500
+++ rdft/simd/Makefile.in	2015-03-04 18:49:29.000000000 -0500
@@ -323,5 +323,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = common sse2 avx altivec neon
+SUBDIRS = common avx altivec neon
+@HAVE_SSE2_TRUE@SUBDIRS += sse2
 EXTRA_DIST = hc2cbv.h hc2cfv.h codlist.mk simd.mk
 all: all-recursive
--- dft/simd/Makefile.in	2014-03-04 13:44:59.000000000 -0500
+++ dft/simd/Makefile.in	2015-03-04 18:49:10.000000000 -0500
@@ -323,5 +323,6 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = common sse2 avx altivec neon
+SUBDIRS = common avx altivec neon
+@HAVE_SSE2_TRUE@SUBDIRS += sse2
 EXTRA_DIST = n1b.h n1f.h n2b.h n2f.h n2s.h q1b.h q1f.h t1b.h t1bu.h	\
 t1f.h t1fu.h t2b.h t2f.h t3b.h t3f.h ts.h codlist.mk simd.mk
--- Makefile.in	2014-03-04 13:44:58.000000000 -0500
+++ Makefile.in	2015-03-04 18:51:05.000000000 -0500
@@ -449,6 +449,6 @@
 EXTRA_DIST = COPYRIGHT bootstrap.sh CONVENTIONS fftw.pc.in
 SIMD_LIBS = \
-	simd-support/libsimd_support.la			\
-	simd-support/libsimd_sse2_nonportable.la
+	simd-support/libsimd_support.la
+@HAVE_SSE2_TRUE@SIMD_LIBS+=simd-support/libsimd_sse2_nonportable.la
 
 @HAVE_SSE2_TRUE@SSE2_LIBS = dft/simd/sse2/libdft_sse2_codelets.la	\