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.

diff --git a/configure b/configure
index 81c19032af6219f8b48762dd72dbf2bcd6cab71c..39c3d33d756dba999007ae5fdc10f128e71f9c03 100755 (executable)
--- 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 34fc09828bd8899e339b4083b490dfae46de7f0f..cbae865deb9d2de7bb9eab38afa2383f74f77fef 100644 (file)
--- 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 9c6e1cc01ae23a062a57ed3ce92f9c5343cdf8a0..180dee3a3ae99b1078f198604f1415985ac79044 100644 (file)
--- 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 73438b69dde9fb0e5909db7bc7ea1d67ec901b32..eda9f1f452c0205ec6f211d29c6da71f648636f6 100644 (file)
--- 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 6f72df587f8745a5d292635f53c908fdb4f8b4e3..ecc5076ccd24bd52e4858c013c2eae6f6c93be87 100644 (file)
--- 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...