Add explicit dependency on sudoers.la to sudo target when sudoers

is compiled statically into the sudo binary.

diff --git a/configure b/configure
index 80e467518d978b15f478ce5039116e39de808388..4feb1727201a78374a0afed8d64cfa10053eafb8 100755 (executable)
--- a/configure
+++ b/configure
@@ -770,6 +770,7 @@ GETGROUPS_LIB
 REPLAY_LIBS
 AFS_LIBS
 NET_LIBS
+STATIC_SUDOERS
 SUDOERS_LIBS
 SUDO_LIBS
 SUDO_OBJS
@@ -2961,6 +2962,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;}
 
 
 
+
 
 
 #
@@ -21116,7 +21118,7 @@ case "$lt_cv_dlopen" in
            $as_echo "#define STATIC_SUDOERS_PLUGIN 1" >>confdefs.h
 
            SUDO_OBJS="${SUDO_OBJS} preload.o"
-           SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+           STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
            SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} --tag=disable-shared -static"
            LT_STATIC=""
        else
@@ -21131,7 +21133,7 @@ case "$lt_cv_dlopen" in
            $as_echo "#define STATIC_SUDOERS_PLUGIN 1" >>confdefs.h
 
            SUDO_OBJS="${SUDO_OBJS} preload.o"
-           SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+           STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
            SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} --tag=disable-shared -static"
            LT_STATIC=""
        else
@@ -21145,7 +21147,7 @@ case "$lt_cv_dlopen" in
        fi
        # Preload sudoers module symbols
        SUDO_OBJS="${SUDO_OBJS} preload.o"
-       SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+       STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
        LT_STATIC=""
        ;;
 esac

diff --git a/configure.ac b/configure.ac
index 47dde373172d9815e1c78e43de73dabddfe680ac..55743f0719af61775991061039ab83cc0bb251a8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ AC_SUBST([SUDO_OBJS])
 AC_SUBST([LIBS])
 AC_SUBST([SUDO_LIBS])
 AC_SUBST([SUDOERS_LIBS])
+AC_SUBST([STATIC_SUDOERS])
 AC_SUBST([NET_LIBS])
 AC_SUBST([AFS_LIBS])
 AC_SUBST([REPLAY_LIBS])
@@ -3329,7 +3330,7 @@ case "$lt_cv_dlopen" in
        if test "$enable_static_sudoers" = "yes"; then
            AC_DEFINE(STATIC_SUDOERS_PLUGIN)
            SUDO_OBJS="${SUDO_OBJS} preload.o"
-           SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+           STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
            SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} --tag=disable-shared -static"
            LT_STATIC=""
        else
@@ -3342,7 +3343,7 @@ case "$lt_cv_dlopen" in
        if test "$enable_static_sudoers" = "yes"; then
            AC_DEFINE(STATIC_SUDOERS_PLUGIN)
            SUDO_OBJS="${SUDO_OBJS} preload.o"
-           SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+           STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
            SUDOERS_LDFLAGS="${SUDOERS_LDFLAGS} --tag=disable-shared -static"
            LT_STATIC=""
        else
@@ -3356,7 +3357,7 @@ case "$lt_cv_dlopen" in
        fi
        # Preload sudoers module symbols
        SUDO_OBJS="${SUDO_OBJS} preload.o"
-       SUDO_LIBS="${SUDO_LIBS} \$(top_builddir)/plugins/sudoers/sudoers.la"
+       STATIC_SUDOERS="\$(top_builddir)/plugins/sudoers/sudoers.la"
        LT_STATIC=""
        ;;
 esac

diff --git a/src/Makefile.in b/src/Makefile.in
index 2fd6ba44700221a944b630f1753d2af75d1b1b22..f38901c2a07be1bfa6f566147e38a33b96858bdf 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -121,8 +121,8 @@ Makefile: $(srcdir)/Makefile.in
 .c.lo:
        $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $<
 
-sudo: $(OBJS) $(LT_LIBS)
-       $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS)
+sudo: $(OBJS) $(LT_LIBS) @STATIC_SUDOERS@
+       $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS) @STATIC_SUDOERS@
 
 libsudo_noexec.la: sudo_noexec.lo
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)