diff --git a/Makefile.am b/Makefile.am
index 4d4f2bb..7bc13e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ minerd_SOURCES	= elist.h miner.h compat.h			\
 		  sha256_cryptopp.c sha256_sse2_amd64.c
 minerd_LDFLAGS	= $(PTHREAD_FLAGS)
 minerd_LDADD	= @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@
+minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@
 
 if HAVE_x86_64
 if HAS_YASM
diff --git a/configure.ac b/configure.ac
index b47b3e3..72b8a9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,10 +56,8 @@ fi
 
 dnl Find YASM
 has_yasm=false
-AC_PATH_PROG(YASM,[yasm],[true yasm])
-if test "$YASM" = "false" ; then
-  AC_MSG_WARN([yasm is required for the x86_64 SSE2 code, but it was not found])
-else
+AC_PATH_PROG([YASM],[yasm],[false])
+if test "x$YASM" != "xfalse" ; then
   AC_MSG_CHECKING([if yasm version is greater than 1.0.1])
   yasmver=`yasm --version | head -1 | cut -d\  -f2`
   yamajor=`echo $yasmver | cut -d. -f1`
@@ -80,11 +78,14 @@ else
   else
     has_yasm=false
   fi
+  if test "x$has_yasm" = "xtrue" ; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+  fi
 fi
-if test "x$has_yasm" == "xtrue" ; then
-  AC_MSG_RESULT([yes])
-else
-  AC_MSG_RESULT([no])
+if test "x$has_yasm" = "xfalse" ; then
+  AC_MSG_NOTICE([yasm is required for the sse2_64 algorithm. It will be skipped.])
 fi
 
 AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue])