diff options
| author | Michael Drake <tlsa@netsurf-browser.org> | 2016-08-13 13:36:17 +0100 |
|---|---|---|
| committer | Michael Drake <tlsa@netsurf-browser.org> | 2016-08-13 13:36:17 +0100 |
| commit | 91f4f89d4c864c6ce0170d60a13a29aed56fea5d (patch) | |
| tree | 2118f4f5b478ec66439c41fe14ccdfae4ad236e4 /content | |
| parent | 6a3f7a386ed7912d19971dec9235ad98692c22c1 (diff) | |
| parent | fe00eac8cb0740b74ec2f586d98e741c84299d90 (diff) | |
| download | netsurf-91f4f89d4c864c6ce0170d60a13a29aed56fea5d.tar.gz netsurf-91f4f89d4c864c6ce0170d60a13a29aed56fea5d.tar.bz2 | |
Merge branch 'tlsa/date'
Diffstat (limited to 'content')
| -rw-r--r-- | content/fetch.c | 2 | ||||
| -rw-r--r-- | content/fetchers/Makefile | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/content/fetch.c b/content/fetch.c index 11adf9cf4..93c7de2ad 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -290,10 +290,12 @@ nserror fetcher_init(void) { nserror ret; +#ifdef WITH_CURL ret = fetch_curl_register(); if (ret != NSERROR_OK) { return ret; } +#endif ret = fetch_data_register(); if (ret != NSERROR_OK) { diff --git a/content/fetchers/Makefile b/content/fetchers/Makefile index 855154232..9c8479320 100644 --- a/content/fetchers/Makefile +++ b/content/fetchers/Makefile @@ -1,8 +1,10 @@ # Content fetchers sources -S_FETCHERS := curl.c data.c file.c about.c resource.c +S_FETCHERS_YES := data.c file.c about.c resource.c +S_FETCHERS_NO := +S_FETCHERS_$(NETSURF_USE_CURL) += curl.c -S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS)) +S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS_YES)) # The following files depend on the testament content/fetchers/about.c: testament $(OBJROOT)/testament.h |