diff options
| author | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-13 14:00:17 +0100 |
|---|---|---|
| committer | Schanzenbach, Martin <mschanzenbach@posteo.de> | 2019-12-13 14:00:17 +0100 |
| commit | 340845f56f3702690dd883e964424fd44db24535 (patch) | |
| tree | c7b0fb97108ef323432e5e8d0c55f1be0ccdc058 | |
| parent | d554b80d09b6e4c8b7fe229ceb95597e9d91291e (diff) | |
| download | gnunet-340845f56f3702690dd883e964424fd44db24535.tar.gz gnunet-340845f56f3702690dd883e964424fd44db24535.zip | |
correctly detect curl/json with missing mhd
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 09d176100..1bcc1ae7b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am | |||
| @@ -24,13 +24,15 @@ endif | |||
| 24 | endif | 24 | endif |
| 25 | 25 | ||
| 26 | if HAVE_JSON | 26 | if HAVE_JSON |
| 27 | if HAVE_MHD | ||
| 27 | JSON_DIR = json | 28 | JSON_DIR = json |
| 29 | endif | ||
| 30 | endif | ||
| 28 | if HAVE_LIBGNURL | 31 | if HAVE_LIBGNURL |
| 29 | JSON_DIR += curl | 32 | CURL_DIR = curl |
| 30 | else | 33 | else |
| 31 | if HAVE_LIBCURL | 34 | if HAVE_LIBCURL |
| 32 | JSON_DIR += curl | 35 | CURL_DIR = curl |
| 33 | endif | ||
| 34 | endif | 36 | endif |
| 35 | endif | 37 | endif |
| 36 | 38 | ||
| @@ -81,6 +83,7 @@ SUBDIRS = \ | |||
| 81 | arm \ | 83 | arm \ |
| 82 | $(TESTING) \ | 84 | $(TESTING) \ |
| 83 | $(JSON_DIR) \ | 85 | $(JSON_DIR) \ |
| 86 | $(CURL_DIR) \ | ||
| 84 | $(REST_DIR) \ | 87 | $(REST_DIR) \ |
| 85 | peerinfo \ | 88 | peerinfo \ |
| 86 | $(SQLITE_DIR) \ | 89 | $(SQLITE_DIR) \ |