Link libsudo_util with -lrt on systems where clock_gettime is in -lrt.

diff --git a/configure b/configure
index f00428d973de5d55eda5330ebb7656ba902519c4..4a261880b59a00e5285874a04e23c9e735812d10 100755 (executable)
--- 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 d975058d6ac5571bf01a33243588b79b927337cd..29a453a19b3c687a19678aceffa5406b6c5f36f5 100644 (file)
--- 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 2117aee671a7975464c774351a4f4647f0d791ed..fc300057e92b43465f6c8fc1282e668e6a4b6f26 100644 (file)
--- 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