From 1592192cef046b60ba06bc1a930a65f41870b866 Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Mon, 2 Mar 2015 16:05:57 -0700 Subject: [PATCH] Link libsudo_util with -lrt on systems where clock_gettime is in -lrt. --- configure | 4 +++- configure.ac | 3 ++- lib/util/Makefile.in | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/configure b/configure index f00428d97..4a261880b 100755 --- a/configure +++ b/configure @@ -738,6 +738,7 @@ LOCALEDIR_SUFFIX SUDO_NLS LIBMD LIBINTL +LIBRT LIBDL CONFIGURE_ARGS LIBTOOL_DEPS @@ -2835,6 +2836,7 @@ $as_echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} + # @@ -19315,7 +19317,7 @@ if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then : $as_echo "#define HAVE_CLOCK_GETTIME 1" >>confdefs.h - LIBS="${LIBS} -lrt" + LIBRT="-lrt" fi diff --git a/configure.ac b/configure.ac index d975058d6..29a453a19 100644 --- a/configure.ac +++ b/configure.ac @@ -74,6 +74,7 @@ AC_SUBST([ZLIB_SRC]) AC_SUBST([LIBTOOL_DEPS]) AC_SUBST([CONFIGURE_ARGS]) AC_SUBST([LIBDL]) +AC_SUBST([LIBRT]) AC_SUBST([LIBINTL]) AC_SUBST([LIBMD]) AC_SUBST([SUDO_NLS]) @@ -2539,7 +2540,7 @@ AC_CHECK_FUNCS([clock_gettime], [], [ # On Solaris, clock_gettime is in librt AC_CHECK_LIB(rt, clock_gettime, [ AC_DEFINE(HAVE_CLOCK_GETTIME) - LIBS="${LIBS} -lrt" + LIBRT="-lrt" ]) ]) AC_CHECK_FUNCS([getopt_long], [], [ diff --git a/lib/util/Makefile.in b/lib/util/Makefile.in index 2117aee67..fc300057e 100644 --- a/lib/util/Makefile.in +++ b/lib/util/Makefile.in @@ -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@;; \ + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) @LIBDL@ @LIBRT@;; \ *) \ - $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBDL@;; \ + $(LIBTOOL) --mode=link $(CC) -o $@ $(LDFLAGS) $(SSP_LDFLAGS) $(LT_LDFLAGS) $(LTOBJS) -version-info $(SHLIB_VERSION) -rpath $(libexecdir)/sudo @LT_DEP_LIBS@ @LIBDL@ @LIBRT@;; \ esac siglist.c: mksiglist -- 2.40.0