git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] zlib in custom location
@ 2007-07-27  5:42 Robert Schiele
  2007-07-27  6:14 ` Robert Schiele
  0 siblings, 1 reply; 2+ messages in thread
From: Robert Schiele @ 2007-07-27  5:42 UTC (permalink / raw)
  To: git

[-- Attachment #1: Type: text/plain, Size: 1066 bytes --]

Hi,

I have some systems with zlib in a custom location and thus did the following
change to support a variable ZLIBDIR like it does already exist for
OPENSSLDIR.  Would be great to see this in the main tree.

commit d61424558cda558b0c7893f545d548c6d6f211ff
Author: Robert Schiele <rschiele@gmail.com>
Date:   Thu Jul 26 22:34:16 2007 -0700

    - add option to find zlib in custom path

diff --git a/Makefile b/Makefile
index 73b487f..0179339 100644
--- a/Makefile
+++ b/Makefile
@@ -372,7 +372,7 @@ BUILTIN_OBJS = \
 	builtin-pack-refs.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
-EXTLIBS = -lz
+EXTLIBS =
 
 #
 # Platform specific tweaks
@@ -517,6 +517,12 @@ ifndef NO_CURL
 	endif
 endif
 
+ifdef ZLIBDIR
+	BASIC_CFLAGS += -I$(ZLIBDIR)/include
+	EXTLIBS += -L$(ZLIBDIR)/lib $(CC_LD_DYNPATH)$(ZLIBDIR)/lib
+endif
+EXTLIBS += -lz
+
 ifndef NO_OPENSSL
 	OPENSSL_LIBSSL = -lssl
 	ifdef OPENSSLDIR

Robert

-- 
Robert Schiele
Dipl.-Wirtsch.informatiker	mailto:rschiele@gmail.com

"Quidquid latine dictum sit, altum sonatur."

[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]

^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2007-07-27  6:15 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-27  5:42 [PATCH] zlib in custom location Robert Schiele
2007-07-27  6:14 ` Robert Schiele

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).