[PATCH] zlib in custom location

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxx>
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@xxxxxxxxx

"Quidquid latine dictum sit, altum sonatur."

Attachment: pgpkysWljdmNI.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux