diff --git a/configure.ac b/configure.ac
index ab0813d..81163b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ AC_ARG_ENABLE([neon-optimizations],
 # Note: We check if optimizations are supported a few lines down.
 AM_CONDITIONAL([X86_OPTIMIZATIONS], [test "x$enable_x86_optimizations" = "xyes"])
 
-
 if test "x$enable_integer_samples" = "xyes"; then
         echo "****** Integer sample type enabled ******"
         AC_DEFINE(SOUNDTOUCH_INTEGER_SAMPLES,1,[Use Integer as Sample type])
@@ -118,7 +117,7 @@ else
         echo "****** Float sample type enabled ******"
         AC_DEFINE(SOUNDTOUCH_FLOAT_SAMPLES,1,[Use Float as Sample type])
 fi
-
+AM_CONDITIONAL([SOUNDTOUCH_FLOAT_SAMPLES], [test "x$enable_integer_samples" != "xyes"])
 
 if test "x$enable_openmp" = "xyes"; then
         echo "****** openmp optimizations enabled ******"
diff --git a/source/Makefile.am b/source/Makefile.am
index ce2b5dc..35d8d4d 100644
--- a/source/Makefile.am
+++ b/source/Makefile.am
@@ -17,8 +17,9 @@
 
 include $(top_srcdir)/config/am_include.mk
 
-SUBDIRS=SoundTouch SoundStretch SoundTouchDLL
-
-# set to something if you want other stuff to be included in the distribution tarball
-#EXTRA_DIST=
-
+if SOUNDTOUCH_FLOAT_SAMPLES
+    # build SoundTouchDLL only if float samples used
+    SUBDIRS=SoundTouch SoundStretch SoundTouchDLL
+else
+    SUBDIRS=SoundTouch SoundStretch
+endif