summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRobert Schiele <rschiele@gmail.com>2007-07-29 20:35:45 +0200
committerJunio C Hamano <gitster@pobox.com>2007-07-31 10:23:43 +0200
commitbef19da9b663044887ecac5ee091ca93567ef331 (patch)
treeac3afb0dfee3c250b4e6a201280a4b471a775769 /Makefile
parentUnset GIT_EDITOR while running tests. (diff)
downloadgit-bef19da9b663044887ecac5ee091ca93567ef331.tar.xz
git-bef19da9b663044887ecac5ee091ca93567ef331.zip
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 c58a4c2a09..ca1247d0e4 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