$NetBSD: patch-ab,v 1.25 2015/04/15 07:31:15 spz Exp $

--- configure.orig	2015-03-03 01:05:29.000000000 +0000
+++ configure
@@ -9508,10 +9508,10 @@ $as_echo "#define LESS_THAN_AIX3_2 1" >>
         dirname=`which gcc`
         dirname=`dirname $dirname`
         dirname=`dirname $dirname`/lib
-	if test "$dirname" != "/lib"; then
-  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-	fi
+#	if test "$dirname" != "/lib"; then
+#	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+#	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+#	fi
     fi
     XLOCKLDFLAGS="-Wl,-R${XLOCK_LDFLAGS}"
     XMLOCKLDFLAGS="-Wl,-R${XMLOCK_LDFLAGS}"
@@ -9566,6 +9566,8 @@ _ACEOF
 if test "x$ac_cv_header_elf_h" = xyes; then :
 
 $as_echo "#define HAVE_SHADOW 1" >>confdefs.h
+XLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XLOCK_LDFLAGS}"
+XMLOCKLDFLAGS="${COMPILER_RPATH_FLAG}${XMLOCK_LDFLAGS}"
 
 fi
 
@@ -9673,10 +9675,10 @@ $as_echo "#define SVR4 1" >>confdefs.h
         dirname=`which gcc`
         dirname=`dirname $dirname`
         dirname=`dirname $dirname`/lib
-	if test "$dirname" != "/lib"; then
-  	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
-  	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
-	fi
+#	if test "$dirname" != "/lib"; then
+#	    XLOCK_LDFLAGS="${XLOCK_LDFLAGS}:$dirname"
+#	    XMLOCK_LDFLAGS="${XMLOCK_LDFLAGS}:$dirname"
+#	fi
     fi
     XLOCKLDFLAGS="-R${XLOCK_LDFLAGS}"
     XMLOCKLDFLAGS="-R${XMLOCK_LDFLAGS}"