diff options
| author |  Petr Baudis <pasky@suse.cz> | 2005-07-29 17:50:51 +0200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-07-29 17:21:52 -0700 |
| commit | dd53c7ab297cc491eb5164198e63d670c7b48530 (patch) | |
| tree | ef6b9f5293b0b910cd59f916ffaa7021987771a9 /rev-list.c | |
| parent | [PATCH] Reorder Makefile rules (diff) | |
| download | tgif-dd53c7ab297cc491eb5164198e63d670c7b48530.tar.xz | |
[PATCH] Support for NO_OPENSSL
Support for completely OpenSSL-less builds. FSF considers distributing GPL
binaries with OpenSSL linked in as a legal problem so this is trouble
e.g. for Debian, or some people might not want to install OpenSSL
anyway. If you
make NO_OPENSSL=1
you get completely OpenSSL-less build, disabling --merge-order and using
Mozilla's SHA1 implementation.
Ported from Cogito.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'rev-list.c')
| -rw-r--r-- | rev-list.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/rev-list.c b/rev-list.c index 846aa2f79e..83a604ae9b 100644 --- a/rev-list.c +++ b/rev-list.c @@ -548,9 +548,13 @@ int main(int argc, char **argv) sort_in_topological_order(&list); show_commit_list(list); } else { +#ifndef NO_OPENSSL if (sort_list_in_merge_order(list, &process_commit)) { - die("merge order sort failed\n"); + die("merge order sort failed\n"); } +#else + die("merge order sort unsupported, OpenSSL not linked"); +#endif } return 0; |