[PATCH] Fix support for old libcurl

diff --git a/Makefile b/Makefile
index f2677be0366b521913942bebc340c59aa3dd620d..1b0ebb4ce8abce524fe7272b4419c731c126daa3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,6 +6,9 @@
 # Define NO_OPENSSL environment variable if you do not have OpenSSL. You will
 # miss out git-rev-list --merge-order. This also implies MOZILLA_SHA1.
 #
+# Define NO_CURL if you do not have curl installed.  git-http-pull is not
+# built, and you cannot use http:// and https:// transports.
+#
 # Define PPC_SHA1 environment variable when running make to make use of
 # a bundled SHA1 routine optimized for PowerPC.
 
@@ -62,21 +65,28 @@ SCRIPTS=git git-apply-patch-script git-merge-one-file-script git-prune-script \
        git-format-patch-script git-sh-setup-script git-push-script \
        git-branch-script git-parse-remote git-verify-tag-script \
        git-ls-remote-script git-clone-dumb-http git-rename-script \
-       git-request-pull-script
+       git-request-pull-script git-bisect-script git-fetch-dumb-http
+
+SCRIPTS += git-count-objects-script
 
 PROG=   git-update-cache git-diff-files git-init-db git-write-tree \
        git-read-tree git-commit-tree git-cat-file git-fsck-cache \
        git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
        git-check-files git-ls-tree git-merge-base git-merge-cache \
        git-unpack-file git-export git-diff-cache git-convert-cache \
-       git-http-pull git-ssh-push git-ssh-pull git-rev-list git-mktag \
+       git-ssh-push git-ssh-pull git-rev-list git-mktag \
        git-diff-helper git-tar-tree git-local-pull git-hash-object \
        git-get-tar-commit-id git-apply git-stripspace \
        git-diff-stages git-rev-parse git-patch-id git-pack-objects \
        git-unpack-objects git-verify-pack git-receive-pack git-send-pack \
        git-prune-packed git-fetch-pack git-upload-pack git-clone-pack \
        git-show-index git-daemon git-var git-peek-remote \
-       git-update-server-info git-show-rev-cache git-build-rev-cache
+       git-update-server-info git-show-rev-cache git-build-rev-cache \
+       git-missing-revs
+
+ifndef NO_CURL
+PROG+= git-http-pull
+endif
 
 LIB_FILE=libgit.a
 LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h epoch.h csum-file.h \
@@ -107,9 +117,11 @@ LIBS += -lz
 
 ifndef NO_OPENSSL
        LIB_OBJS += epoch.o
+       OPENSSL_LIBSSL=-lssl
 else
        CFLAGS += '-DNO_OPENSSL'
        MOZILLA_SHA1=1
+       OPENSSL_LIBSSL=
 endif
 ifdef MOZILLA_SHA1
   SHA1_HEADER="mozilla-sha1/sha1.h"
@@ -147,7 +159,7 @@ git-ssh-pull: rsh.o pull.o
 git-ssh-push: rsh.o
 
 git-http-pull: LIBS += -lcurl
-git-rev-list: LIBS += -lssl
+git-rev-list: LIBS += $(OPENSSL_LIBSSL)
 
 $(LIB_OBJS): $(LIB_H)
 $(DIFF_OBJS): diffcore.h
@@ -180,7 +192,7 @@ check:
 
 install: $(PROG) $(SCRIPTS)
        $(INSTALL) -m755 -d $(dest)$(bindir)
-       $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
+       $(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bindir)
 
 install-tools:
        $(MAKE) -C tools install