diff options
| author | Robert Schiele <rschiele@gmail.com> | 2007-07-29 20:35:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-31 01:23:43 -0700 |
| commit | bef19da9b663044887ecac5ee091ca93567ef331 (patch) | |
| tree | ac3afb0dfee3c250b4e6a201280a4b471a775769 | |
| parent | 18508c39c48d457fd095e0e30391471658698a1a (diff) | |
| download | git-bef19da9b663044887ecac5ee091ca93567ef331.tar.gz git-bef19da9b663044887ecac5ee091ca93567ef331.tar.xz | |
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>
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 10 insertions, 1 deletions
@@ -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 diff --git a/configure.ac b/configure.ac index 50d2b85ac..b2f196585 100644 --- a/configure.ac +++ b/configure.ac @@ -75,6 +75,9 @@ GIT_ARG_SET_PATH(shell) # Define PERL_PATH to provide path to Perl. GIT_ARG_SET_PATH(perl) # +# Define ZLIB_PATH to provide path to zlib. +GIT_ARG_SET_PATH(zlib) +# # Declare the with-tcltk/without-tcltk options. AC_ARG_WITH(tcltk, AS_HELP_STRING([--with-tcltk],[use Tcl/Tk GUI (default is YES)]) |