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>

diff --git a/Makefile b/Makefile
index c58a4c2a09bf7824f8d68b34d218c077f1996865..ca1247d0e4174f3700768b3941bdaa99063a1e72 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -373,7 +373,7 @@ BUILTIN_OBJS = \
        builtin-pack-refs.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)
        builtin-pack-refs.o
 
 GITLIBS = $(LIB_FILE) $(XDIFF_LIB)

-EXTLIBS = -lz
+EXTLIBS =

 
 #
 # Platform specific tweaks
 
 #
 # Platform specific tweaks


@@ -518,6 +518,12 @@ ifndef NO_CURL
        endif
 endif
 
        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
 ifndef NO_OPENSSL
        OPENSSL_LIBSSL = -lssl
        ifdef OPENSSLDIR

diff --git a/configure.ac b/configure.ac
index 50d2b85ace7d79ba1b8c576b54c6ef1f22ddf91f..b2f196585ddf311a46b476545cbb849b4fa7640c 100644 (file)
--- 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 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)])
 # Declare the with-tcltk/without-tcltk options.
 AC_ARG_WITH(tcltk,
 AS_HELP_STRING([--with-tcltk],[use Tcl/Tk GUI (default is YES)])