From: Randal L. Schwartz <merlyn@stonehenge.com>
Date: Sun, 06 Nov 2005 12:33:07 GMT
Subject: Re: What's in git.git tonight
Message-ID: <86u0eqrm64.fsf@blue.stonehenge.com>
In-Reply-To: <868xw2t1vg.fsf@blue.stonehenge.com>

>>>>> "Randal" == Randal L Schwartz <merlyn@stonehenge.com> writes:

Randal> As a separate problem, why make git depend on expat if the only part
Randal> of this is for DAV pushing?  Can http-push simply refuse DAV URLs if
Randal> built without expat?

Ignore that.  Yes, defining "NO_EXPAT" is enough.  Didn't notice that there.

And, I've confirmed that this patch does the trick, and will probably
defer any other issues with "optional" packages in the future:

diff --git a/Makefile b/Makefile
index 6f9b0d1..f89e0bd 100644
--- a/Makefile
+++ b/Makefile
@@ -185,6 +185,10 @@ uname_O := $(shell sh -c 'uname -o 2>/de
 ifeq ($(uname_S),Darwin)
        NEEDS_SSL_WITH_CRYPTO = YesPlease
        NEEDS_LIBICONV = YesPlease
+       ## fink
+       ALL_CFLAGS += -I/sw/include -L/sw/lib
+       ## darwinports
+       ALL_CFLAGS += -I/opt/local/include -L/opt/local/lib
 endif
 ifeq ($(uname_S),SunOS)
        NEEDS_SOCKET = YesPlease

Note that whitespace may have been eaten... this was a cut-n-paste.

-- 
Randal L. Schwartz - Stonehenge Consulting Services, Inc. - +1 503 777 0095
<merlyn@stonehenge.com> <URL:http://www.stonehenge.com/merlyn/>
Perl/Unix/security consulting, Technical writing, Comedy, etc. etc.
See PerlTraining.Stonehenge.com for onsite and open-enrollment Perl training!