[PATCH] add option to find zlib in custom path

[PATCH] add option to find zlib in custom path

[Robert Schiele]

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

You can also fetch this patch as d669d5f17feb3b406862fd83b42998b2353da44f from
git://schiele.dyndns.org/git

 Makefile     |    8 +++++++-
 configure.ac |    3 +++
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index 73b487f..21bf5c7 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 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 50d2b85..b2f1965 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)])
-- 
1.5.2.3

Re: [PATCH] add option to find zlib in custom path

[Robert Schiele]

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

On Sun, Jul 29, 2007 at 08:35:45PM +0200, Robert Schiele wrote:
> 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.

Just wanted to ping about that patch I sent.  After I did not get any response
on earlier patches I sent I found that they did not comply to the patch
submission policy.  Thus I did this one according to the policy (as far as I
understand it but still don't get any reply.

So I just wanted to ask what's the cause of that?

Didn't you just have time to look at it?

Did I do something wrong?  In that case it would be useful if I knew what it
is.

Any other reason?

I mean if it is a timing issue it is not a big issue.  Just wanted to know
whether it does make sense to submit more patches or if they all get lost for
some reason I am currently not aware of.

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 --]

Re: [PATCH] add option to find zlib in custom path

[Junio C Hamano]

Queued already, integration tested last night, been too busy to
push it out.

Patience, Ok?

Re: [PATCH] add option to find zlib in custom path

[Robert Schiele]

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

On Tue, Jul 31, 2007 at 06:06:50PM -0700, Junio C Hamano wrote:
> Queued already, integration tested last night, been too busy to
> push it out.
> 
> Patience, Ok?

Sure, that's perferctly ok.  Take the time you need.  Just wanted to know that
there is nothing wrong in principle with the patches so that I could do more
without wasting time.

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 --]