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

diff --cc Makefile
index dfed7bae9439675bb734c0f9fb3852ecb01fdf6d,2b6b66a883621fa5535486119e835021a2600260..cd3d621ae8deb8227dd8f9130689778458690245
--- 1/Makefile
--- 2/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 f67d673d013b3db84df804d5313c54ac186cae0b,467b4aaeeada518f9a65127ad9a0a63c57117217..17e9861c0634133ec5e07af99191cff99f8a40ad
--- 1/config.mak.in
--- 2/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