From ca3f9d5c3af86767ea71ad4ec7719e98280ba5b1 Mon Sep 17 00:00:00 2001 From: elbandi Date: Wed, 9 Dec 2015 01:07:39 +0100 Subject: [PATCH] Always use libcurl cflags --- Makefile.am | 6 +++--- configure.ac | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 7047bf10..ac2ecdad 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,10 +18,10 @@ sgminer_LDADD = $(DLOPEN_FLAGS) @LIBCURL_LIBS@ @JANSSON_LIBS@ @PTHREAD_LIBS@ @OPENCL_LIBS@ @NCURSES_LIBS@ @PDCURSES_LIBS@ @WS2_LIBS@ \ @MM_LIBS@ @RT_LIBS@ @MATH_LIBS@ lib/libgnu.a ccan/libccan.a sph/libsph.a -sgminer_CPPFLAGS += -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ +sgminer_CPPFLAGS += -I$(top_builddir)/lib -I$(top_srcdir)/lib @OPENCL_FLAGS@ @LIBCURL_CFLAGS@ -if !HAVE_WINDOWS -sgminer_CPPFLAGS += @LIBCURL_CFLAGS@ +if HAVE_WINDOWS +sgminer_LDFLAGS += -all-static endif sgminer_CPPFLAGS += $(ADL_CPPFLAGS) diff --git a/configure.ac b/configure.ac index dd135150..681c2b9c 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,7 @@ else LIBCURL_LIBS="" fi AC_SUBST(LIBCURL_LIBS) +AC_SUBST(LIBCURL_CFLAGS) # Enable or disable use of git version in version string AC_MSG_CHECKING(whether to use git version if available)