From: Junio C Hamano Date: Fri, 23 Sep 2005 09:07:07 GMT Subject: Re: /bin/sh portability question Message-ID: <7vmzm4duf8.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20050923075058.GA25473@bohr.gbar.dtu.dk> "Peter Eriksen" writes: > It seems things are progressing nicely with regard to > Solaris portability. Good to have a Solaris user. I have one patch that I've been keeping in the proposed updates branch, waiting for a comfirmation or 'not-good-enough-for-me' answer from people that have cURL installed in nonstandard places. ------------ Subject: [PATCH] CURLDIR in Makefile From: Patrick Mauritz Date: 1127139079 +0200 Support systems that do not install curl headers and libraries in /usr/{include,lib}. Signed-off-by: Patrick Mauritz Signed-off-by: Junio C Hamano --- Makefile | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) a5ebfc164f8380eb4c1c2ff92082687c3cb0b39d diff --git a/Makefile b/Makefile --- a/Makefile +++ b/Makefile @@ -9,6 +9,9 @@ # Define NO_CURL if you do not have curl installed. git-http-pull is not # built, and you cannot use http:// and https:// transports. # +# Define CURLDIR=/foo/bar if your curl header and library files are in +# /foo/bar/include and /foo/bar/lib directories. +# # Define NO_STRCASESTR if you don't have strcasestr. # # Define PPC_SHA1 environment variable when running make to make use of @@ -131,6 +134,13 @@ ifdef WITH_SEND_EMAIL endif ifndef NO_CURL + ifdef CURLDIR + # This is still problematic -- gcc does not want -R. + CFLAGS += -I$(CURLDIR)/include + CURL_LIBCURL = -L$(CURLDIR)/lib -R$(CURLDIR)/lib -lcurl + else + CURL_LIBCURL = -lcurl + endif PROGRAMS += git-http-fetch endif @@ -285,7 +295,7 @@ git-ssh-upload: rsh.o git-ssh-pull: rsh.o fetch.o git-ssh-push: rsh.o -git-http-fetch: LIBS += -lcurl +git-http-fetch: LIBS += $(CURL_LIBCURL) git-rev-list: LIBS += $(OPENSSL_LIBSSL) init-db.o: init-db.c