From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 8 Sep 2008 06:45:56 +0000 (-0700)
Subject: Merge branch 'jc/cc-ld-dynpath'
X-Git-Tag: v1.6.1-rc1~264
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cd50988ae03e086ca1a8f18584153d359699ea25;p=git.git

Merge branch 'jc/cc-ld-dynpath'

* jc/cc-ld-dynpath:
  configure: auto detect dynamic library path switches
  Makefile: Allow CC_LD_DYNPATH to be overriden

Conflicts:
	Makefile
	config.mak.in
---

cd50988ae03e086ca1a8f18584153d359699ea25
diff --cc Makefile
index dfed7bae9,2b6b66a88..cd3d621ae
--- a/Makefile
+++ b/Makefile
@@@ -697,9 -688,7 +697,8 @@@ ifeq ($(uname_S),NetBSD
  		NEEDS_LIBICONV = YesPlease
  	endif
  	BASIC_CFLAGS += -I/usr/pkg/include
- 	BASIC_LDFLAGS += -L/usr/pkg/lib
- 	ALL_LDFLAGS += -Wl,-rpath,/usr/pkg/lib
+ 	BASIC_LDFLAGS += -L/usr/pkg/lib $(CC_LD_DYNPATH)/usr/pkg/lib
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),AIX)
  	NO_STRCASESTR=YesPlease
diff --cc config.mak.in
index f67d673d0,467b4aaee..17e9861c0
--- a/config.mak.in
+++ b/config.mak.in
@@@ -3,7 -3,7 +3,8 @@@
  
  CC = @CC@
  CFLAGS = @CFLAGS@
 +LDFLAGS = @LDFLAGS@
+ CC_LD_DYNPATH = @CC_LD_DYNPATH@
  AR = @AR@
  TAR = @TAR@
  #INSTALL = @INSTALL@		# needs install-sh or install.sh in sources