diff options
| author | Tor Andersson <tor.andersson@artifex.com> | 2014-05-08 14:07:01 +0200 |
|---|---|---|
| committer | Tor Andersson <tor.andersson@artifex.com> | 2014-05-08 14:19:39 +0200 |
| commit | 2ad14d533de5b91e4f40ce01077efcdeb201b8ce (patch) | |
| tree | f4e9887a22d8a986bc19390b0256f0600f087ebf | |
| parent | b2f7be4877598bdba3676ec93fcd004f275ccce5 (diff) | |
| download | mupdf-2ad14d533de5b91e4f40ce01077efcdeb201b8ce.tar.xz | |
Fix curl build with thirdparty module when system curl is available too.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | Makerules | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -264,7 +264,7 @@ ifeq "$(HAVE_CURL)" "yes" MUVIEW_X11_CURL := $(OUT)/mupdf-x11-curl $(MUVIEW_X11_CURL) : $(MUPDF_LIB) $(THIRD_LIBS) $(CURL_LIB) $(MUVIEW_X11_CURL) : $(addprefix $(OUT)/platform/x11/curl/, x11_main.o x11_image.o pdfapp.o curl_stream.o) - $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) + $(LINK_CMD) $(X11_LIBS) $(CURL_LIBS) $(SYS_CURL_DEPS) endif endif @@ -67,9 +67,8 @@ ifeq "$(shell pkg-config --exists libcurl && echo yes)" "yes" HAVE_CURL = yes SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) -else -SYS_CURL_DEPS = -lpthread -lrt endif +SYS_CURL_DEPS = -lpthread -lrt SYS_X11_CFLAGS = $(shell pkg-config --cflags x11 xext) SYS_X11_LIBS = $(shell pkg-config --libs x11 xext) |