From 89cd8c2ff1bf63241cc43a22a5462d31d9a1f196 Mon Sep 17 00:00:00 2001
From: "Todd C. Miller" <Todd.Miller@courtesan.com>
Date: Wed, 6 Apr 2011 07:01:17 -0400
Subject: [PATCH] Back out the --with-libpath addition to SUDOERS_LDFLAGS since
 that now include LDFLAGS in the sudoers Makefile.in. Add missing settng of
 @LDFLAGS@ in plugin Makefile.in files.

---
 configure                        | 15 ---------------
 configure.in                     |  1 -
 plugins/sample/Makefile.in       |  2 +-
 plugins/sample_group/Makefile.in |  2 +-
 plugins/sudoers/Makefile.in      |  4 ++--
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/configure b/configure
index 81c19032a..39c3d33d7 100755
--- a/configure
+++ b/configure
@@ -13556,21 +13556,6 @@ if test -n "$with_libpath"; then
 	blibpath_add="${blibpath_add}:$i"
     fi
 
-
-    if test X"$with_rpath" = X"yes"; then
-	case "$host" in
-	    *-*-hpux*)	SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i -Wl,+b,$i"
-			;;
-	    *)		SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i -Wl,-R$i"
-			;;
-	esac
-    else
-	SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} -L$i"
-    fi
-    if test X"$blibpath" != X"" -a "SUDOERS_LDFLAGS" = "SUDO_LDFLAGS"; then
-	blibpath_add="${blibpath_add}:$i"
-    fi
-
     done
 fi
 if test -n "$with_libraries"; then
diff --git a/configure.in b/configure.in
index 34fc09828..cbae865de 100644
--- a/configure.in
+++ b/configure.in
@@ -1845,7 +1845,6 @@ dnl
 if test -n "$with_libpath"; then
     for i in ${with_libpath}; do
 	SUDO_APPEND_LIBPATH(LDFLAGS, [$i])
-	SUDO_APPEND_LIBPATH(SUDOERS_LDFLAGS, [$i])
     done
 fi
 if test -n "$with_libraries"; then
diff --git a/plugins/sample/Makefile.in b/plugins/sample/Makefile.in
index 9c6e1cc01..180dee3a3 100644
--- a/plugins/sample/Makefile.in
+++ b/plugins/sample/Makefile.in
@@ -42,7 +42,7 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) @CPPFLAGS@
 CFLAGS = @CFLAGS@
 
 # Flags to pass to the link stage
-LDFLAGS =
+LDFLAGS = @LDFLAGS@
 LTLDFLAGS = @LTLDFLAGS@
 
 # Where to install things...
diff --git a/plugins/sample_group/Makefile.in b/plugins/sample_group/Makefile.in
index 73438b69d..eda9f1f45 100644
--- a/plugins/sample_group/Makefile.in
+++ b/plugins/sample_group/Makefile.in
@@ -42,7 +42,7 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) @CPPFLAGS@
 CFLAGS = @CFLAGS@
 
 # Flags to pass to the link stage
-LDFLAGS =
+LDFLAGS = @LDFLAGS@
 LTLDFLAGS = @LTLDFLAGS@
 
 # Where to install things...
diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 6f72df587..ecc5076cc 100644
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -55,8 +55,8 @@ CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
 CFLAGS = @CFLAGS@
 
 # Flags to pass to the link stage
-LDFLAGS =
-SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@
+LDFLAGS = @LDFLAGS@
+SUDOERS_LDFLAGS = @LDFLAGS@ @SUDOERS_LDFLAGS@
 LTLDFLAGS = @LTLDFLAGS@
 
 # Where to install things...