summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Schiele <rschiele@gmail.com>2007-07-29 18:35:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2007-07-31 08:23:43 (GMT)
commitbef19da9b663044887ecac5ee091ca93567ef331 (patch)
treeac3afb0dfee3c250b4e6a201280a4b471a775769 /Makefile
parent18508c39c48d457fd095e0e30391471658698a1a (diff)
downloadgit-bef19da9b663044887ecac5ee091ca93567ef331.zip
git-bef19da9b663044887ecac5ee091ca93567ef331.tar.gz
git-bef19da9b663044887ecac5ee091ca93567ef331.tar.bz2
add option to find zlib in custom path
Some systems do not provide zlib development headers and libraries in default search path of the compiler. For these systems we should allow specifying the location by --with-zlib=PATH or by setting ZLIB_PATH in the makefile. Signed-off-by: Robert Schiele <rschiele@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index c58a4c2..ca1247d 100644
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,7 @@ BUILTIN_OBJS = \
builtin-pack-refs.o
GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
-EXTLIBS = -lz
+EXTLIBS =
#
# Platform specific tweaks
@@ -518,6 +518,12 @@ ifndef NO_CURL
endif
endif
+ifdef ZLIB_PATH
+ BASIC_CFLAGS += -I$(ZLIB_PATH)/include
+ EXTLIBS += -L$(ZLIB_PATH)/lib $(CC_LD_DYNPATH)$(ZLIB_PATH)/lib
+endif
+EXTLIBS += -lz
+
ifndef NO_OPENSSL
OPENSSL_LIBSSL = -lssl
ifdef OPENSSLDIR