Skip to content

Commit 6cfb4c0

Browse files
authored
Merge pull request #1555 from Croydon/croydon/curl
Use curl-config to find curl
2 parents e9614db + 0e6bb92 commit 6cfb4c0

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@ In Ubuntu:
102102
sudo apt-get install libssl-dev
103103
```
104104

105+
Additionally, you need `curl-config` on your system. You need one of these packages:
106+
* libcurl4-gnutls-dev
107+
* libcurl4-nss-dev
108+
* libcurl4-openssl-dev
109+
105110
If you are still encountering problems while installing, you should try the
106111
[Building from source](http://www.nodegit.org/guides/install/from-source/)
107112
instructions.

‎generate/templates/templates/binding.gyp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,9 +92,9 @@
9292
}
9393
],
9494
[
95-
"OS=='linux' or OS=='mac'", {
95+
"OS=='linux' or OS=='mac' or OS.endswith('bsd')", {
9696
"libraries": [
97-
"-lcurl"
97+
"<!(curl-config --libs)"
9898
]
9999
}
100100
],

‎vendor/libgit2.gyp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,8 @@
305305
}],
306306
["OS=='mac' or OS=='linux' or OS.endswith('bsd')", {
307307
"cflags": [
308-
"-DGIT_CURL"
308+
"-DGIT_CURL",
309+
"<!(curl-config --cflags)"
309310
],
310311
"defines": [
311312
"GIT_CURL",

0 commit comments

Comments
 (0)