LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #22 from chrissicool/master

Browse source 
Fix include path of libcurl headers
This commit is contained in:
Jeff Garzik 2011-06-08 18:59:09 -07:00
commit 84ae273db9
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile.am
View file

@ -19,6 +19,7 @@ minerd_SOURCES = elist.h miner.h compat.h \
sha256_cryptopp.c sha256_sse2_amd64.c sha256_cryptopp.c sha256_sse2_amd64.c
minerd_LDFLAGS = $(PTHREAD_FLAGS) minerd_LDFLAGS = $(PTHREAD_FLAGS)
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@ minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@
minerd_CPPFLAGS = @LIBCURL_CPPFLAGS@
if HAVE_x86_64 if HAVE_x86_64
if HAS_YASM if HAS_YASM

13
configure.ac
View file

@ -56,10 +56,8 @@ fi
dnl Find YASM dnl Find YASM
has_yasm=false has_yasm=false
AC_PATH_PROG(YASM,[yasm],[true yasm]) AC_PATH_PROG([YASM],[yasm],[false])
if test "$YASM" = "false" ; then if test "x$YASM" != "xfalse" ; then
AC_MSG_WARN([yasm is required for the x86_64 SSE2 code, but it was not found])
else
AC_MSG_CHECKING([if yasm version is greater than 1.0.1]) AC_MSG_CHECKING([if yasm version is greater than 1.0.1])
yasmver=`yasm --version | head -1 | cut -d\ -f2` yasmver=`yasm --version | head -1 | cut -d\ -f2`
yamajor=`echo $yasmver | cut -d. -f1` yamajor=`echo $yasmver | cut -d. -f1`
@ -80,12 +78,15 @@ else
else else
has_yasm=false has_yasm=false
fi fi
fi if test "x$has_yasm" = "xtrue" ; then
if test "x$has_yasm" == "xtrue" ; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
fi
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]) AM_CONDITIONAL([HAS_YASM], [test x$has_yasm = xtrue])