Make libsudo_util depend on libintl instead of requiring users of

libsudo_util to link with libintl directly.  Bug #690

diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in
index 28cc5daa3fc9696c81026023dac0aa939b0d428b..12217794dd711c53639b3a0191cc1b78fc474322 100644 (file)
--- a/lib/util/Makefile.in
+++ b/lib/util/Makefile.in
@@ -79,7 +79,7 @@ CPPCHECK_OPTS = -q --force --enable=warning,performance,portability --suppress=c
 
 # Regression tests
 TEST_PROGS = atofoo_test conf_test hltq_test parseln_test progname_test @COMPAT_TEST_PROGS@
-TEST_LIBS = @LIBS@ @LIBINTL@
+TEST_LIBS = @LIBS@
 TEST_LDFLAGS = @LDFLAGS@
 
 # User and group ids the installed files should be "owned" by
@@ -136,9 +136,9 @@ $(shlib_opt): $(shlib_exp)
 libsudo_util.la: $(LTOBJS) @LT_LDDEP@
        case "$(LT_LDFLAGS)" in \
        *-no-install*) \
-           $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) @LIBDL@ @LIBRT@;; \
+           $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) @LIBINTL@ @LIBDL@ @LIBRT@;; \
        *) \
-           $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBDL@ @LIBRT@;; \
+           $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBINTL@ @LIBDL@ @LIBRT@;; \
        esac
 
 siglist.c: mksiglist

diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in
index 0e40ec2af2f62fbc7c7a7a5be93b0f45479e02f8..078183b5724b5fe228b3583da52694450345ab5c 100644 (file)
--- a/plugins/sudoers/Makefile.in
+++ b/plugins/sudoers/Makefile.in
@@ -51,7 +51,7 @@ INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
 
 # Libraries
 LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
-LIBS = $(LT_LIBS) @LIBINTL@
+LIBS = $(LT_LIBS)
 NET_LIBS = @NET_LIBS@
 SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) @ZLIB@ @LIBMD@
 REPLAY_LIBS = @REPLAY_LIBS@ @ZLIB@

diff --git a/src/Makefile.in b/src/Makefile.in
index 0d10add5861d88b4151e202dc6c400b19e05c15c..f27e06bba94330de38dd54828a0d69c82953d9f1 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -37,7 +37,7 @@ INSTALL_OWNER = -o $(install_uid) -g $(install_gid)
 
 # Libraries
 LT_LIBS = $(top_builddir)/lib/util/libsudo_util.la
-LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ @LIBINTL@ $(LT_LIBS)
+LIBS = @LIBS@ @SUDO_LIBS@ @GETGROUPS_LIB@ @NET_LIBS@ $(LT_LIBS)
 
 # C preprocessor flags
 CPPFLAGS = -I$(incdir) -I$(top_builddir) -I. -I$(srcdir) -I$(top_srcdir) @CPPFLAGS@
@@ -86,7 +86,7 @@ INIT_SCRIPT=@INIT_SCRIPT@
 RC_LINK=@RC_LINK@
 
 TEST_PROGS = check_ttyname
-TEST_LIBS = @LIBS@ @LIBINTL@ $(LT_LIBS)
+TEST_LIBS = @LIBS@ $(LT_LIBS)
 TEST_LDFLAGS = @LDFLAGS@
 
 # OS dependent defines
@@ -133,8 +133,8 @@ sudo: $(OBJS) $(LT_LIBS) @STATIC_SUDOERS@
 sudo_noexec.la: sudo_noexec.lo
        $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(LT_LDFLAGS) $(SSP_LDFLAGS) -o $@ sudo_noexec.lo -module -avoid-version -rpath $(noexecdir) -shrext .so
 
-sesh: $(SESH_OBJS) @LIBINTL@ $(LT_LIBS)
-       $(LIBTOOL) --mode=link $(CC) -o $@ $(SESH_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) @LIBINTL@ $(LIBS)
+sesh: $(SESH_OBJS) $(LT_LIBS)
+       $(LIBTOOL) --mode=link $(CC) -o $@ $(SESH_OBJS) $(LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(LIBS)
 
 check_ttyname: $(CHECK_TTYNAME_OBJS) $(top_builddir)/lib/util/libsudo_util.la
        $(LIBTOOL) --mode=link $(CC) -o $@ $(CHECK_TTYNAME_OBJS) $(TEST_LDFLAGS) $(PIE_LDFLAGS) $(SSP_LDFLAGS) $(TEST_LIBS)