From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Fri, 20 Apr 2012 13:41:18 +0000 (-0400)
Subject: Do not pass libtool the -static-libtool-libs option when building
X-Git-Tag: SUDO_1_8_5~1^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f490ff228820d2372cdae083063e00c6e7f5a53d;p=sudo

Do not pass libtool the -static-libtool-libs option when building
sudo and sesh.  Otherwise, libtool may prefer a static version of
an installed library over a dynamic one when linking.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index f6aff2591..601b57fd0 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -94,13 +94,13 @@ Makefile: $(srcdir)/Makefile.in
 	$(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $<
 
 sudo: $(OBJS) $(LT_LIBS)
-	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS) -static-libtool-libs
+	$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJS) $(LDFLAGS) $(LIBS)
 
 libsudo_noexec.la: sudo_noexec.lo
 	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LTLDFLAGS) -o $@ sudo_noexec.lo -avoid-version -rpath $(noexecdir)
 
 sesh: sesh.o error.o exec_common.o @LIBINTL@ $(LT_LIBS)
-	$(LIBTOOL) --mode=link $(CC) -o $@ sesh.o error.o exec_common.o $(LDFLAGS) @LIBINTL@ $(LIBS) -static-libtool-libs
+	$(LIBTOOL) --mode=link $(CC) -o $@ sesh.o error.o exec_common.o $(LDFLAGS) @LIBINTL@ $(LIBS)
 
 pre-install: