Merge branch 'maint'

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

Conflicts:

	Makefile

diff --cc Makefile
index a1861de2cc835cff1d72322bc6510abb1e32c529,c5a180490b0fbb6bae8a9a2a87c3795c89391c2f..906e98492080d2fde9467a9970fc92d7a8cfeaf8
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -415,6 -411,31 +403,21 @@@ endi
  -include config.mak.autogen
  -include config.mak
  
 -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
 -
+ 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
+ 
  ifndef NO_CURL
        ifdef CURLDIR
                # This is still problematic -- gcc does not always want -R.