From: Junio C Hamano <junkio@cox.net>
Date: Wed, 13 Dec 2006 01:07:33 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.0-rc0~137
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fa2376f3c89ae59f33e50e0e5769dec2652e9568;p=git.git

Merge branch 'maint'

* maint:
  Clarify fetch error for missing objects.
  Move Fink and Ports check to after config file

Conflicts:

	Makefile
---

fa2376f3c89ae59f33e50e0e5769dec2652e9568
diff --cc Makefile
index a1861de2c,c5a180490..906e98492
--- a/Makefile
+++ b/Makefile
@@@ -415,6 -411,31 +403,21 @@@ endi
  -include config.mak.autogen
  -include config.mak
  
+ ifeq ($(uname_S),Darwin)
+ 	ifndef NO_FINK
+ 		ifeq ($(shell test -d /sw/lib && echo y),y)
+ 			BASIC_CFLAGS += -I/sw/include
+ 			BASIC_LDFLAGS += -L/sw/lib
+ 		endif
+ 	endif
+ 	ifndef NO_DARWIN_PORTS
+ 		ifeq ($(shell test -d /opt/local/lib && echo y),y)
+ 			BASIC_CFLAGS += -I/opt/local/include
+ 			BASIC_LDFLAGS += -L/opt/local/lib
+ 		endif
+ 	endif
+ endif
+ 
 -ifdef WITH_OWN_SUBPROCESS_PY
 -	PYMODULES += compat/subprocess.py
 -else
 -	ifeq ($(NO_PYTHON),)
 -		ifneq ($(shell $(PYTHON_PATH) -c 'import subprocess;print"OK"' 2>/dev/null),OK)
 -			PYMODULES += compat/subprocess.py
 -		endif
 -	endif
 -endif
 -
  ifndef NO_CURL
  	ifdef CURLDIR
  		# This is still problematic -- gcc does not always want -R.