summaryrefslogtreecommitdiff
path: root/Makethird
diff options
context:
space:
mode:
authorTor Andersson <tor.andersson@artifex.com>2014-05-07 13:42:34 +0200
committerTor Andersson <tor.andersson@artifex.com>2014-05-07 13:42:34 +0200
commit6778237e119ba28f4d8c1b3293ac9a148b408771 (patch)
tree926af43581af9c2332ec324ae4ade41fd42171f2 /Makethird
parent6d92ef42d2c04e7c0aac9fe5b7da8e8771d7bd99 (diff)
downloadmupdf-6778237e119ba28f4d8c1b3293ac9a148b408771.tar.xz
Fix 694428: use system CURL library if available.
Diffstat (limited to 'Makethird')
-rw-r--r--Makethird7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makethird b/Makethird
index 123d5509..73638699 100644
--- a/Makethird
+++ b/Makethird
@@ -454,6 +454,10 @@ CURL_CFLAGS := -I$(CURL_DIR)/include
CURL_LIBS := $(SYS_CURL_DEPS)
HAVE_CURL := yes
+
+else ifeq "$(HAVE_CURL)" "yes"
+CURL_CFLAGS := $(SYS_CURL_CFLAGS)
+CURL_LIBS := $(SYS_CURL_LIBS)
endif
# --- X11 ---
@@ -461,7 +465,4 @@ endif
ifeq "$(HAVE_X11)" "yes"
X11_CFLAGS := $(SYS_X11_CFLAGS)
X11_LIBS := $(SYS_X11_LIBS)
-else
-X11_CFLAGS :=
-X11_LIBS :=
endif