From: Todd C. Miller Date: Mon, 22 Mar 2010 23:55:49 +0000 (-0400) Subject: Add REPLAY_LIBS for sudoreplay and add -lrt to it on Solaris. X-Git-Tag: SUDO_1_8_0~767 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ea0d60cbdeb8dc6272c476ba6e428aa935b5a4a;p=sudo Add REPLAY_LIBS for sudoreplay and add -lrt to it on Solaris. --- diff --git a/configure b/configure index f05a1896b..e270392fa 100755 --- a/configure +++ b/configure @@ -815,6 +815,7 @@ SUDO_LIBS SUDOERS_LIBS NET_LIBS AFS_LIBS +REPLAY_LIBS GETGROUPS_LIB OSDEFS AUTH_OBJS @@ -2134,6 +2135,7 @@ echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} + timeout=5 @@ -6610,7 +6612,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6613 "configure"' > conftest.$ac_ext + echo '#line 6615 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8474,11 +8476,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8477: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8479: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8481: \$? = $ac_status" >&5 + echo "$as_me:8483: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8764,11 +8766,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8767: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8769: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8771: \$? = $ac_status" >&5 + echo "$as_me:8773: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8868,11 +8870,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8871: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8873: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8875: \$? = $ac_status" >&5 + echo "$as_me:8877: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11228,7 +11230,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5 echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6; } if test $ac_cv_lib_rt_nanosleep = yes; then - LIBS="${LIBS} -lrt" + REPLAY_LIBS="${REPLAY_LIBS} -lrt" else case " $LIBOBJS " in *" nanosleep.$ac_objext "* ) ;; @@ -27173,6 +27175,7 @@ SUDO_LIBS!$SUDO_LIBS$ac_delim SUDOERS_LIBS!$SUDOERS_LIBS$ac_delim NET_LIBS!$NET_LIBS$ac_delim AFS_LIBS!$AFS_LIBS$ac_delim +REPLAY_LIBS!$REPLAY_LIBS$ac_delim GETGROUPS_LIB!$GETGROUPS_LIB$ac_delim OSDEFS!$OSDEFS$ac_delim AUTH_OBJS!$AUTH_OBJS$ac_delim @@ -27219,7 +27222,6 @@ mail_no_host!$mail_no_host$ac_delim mail_no_perms!$mail_no_perms$ac_delim mailto!$mailto$ac_delim mailsub!$mailsub$ac_delim -badpass_message!$badpass_message$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -27261,6 +27263,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +badpass_message!$badpass_message$ac_delim fqdn!$fqdn$ac_delim runas_default!$runas_default$ac_delim env_editor!$env_editor$ac_delim @@ -27309,7 +27312,7 @@ KRB5CONFIG!$KRB5CONFIG$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 47; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/configure.in b/configure.in index 33c3d8047..b2bbf1be7 100644 --- a/configure.in +++ b/configure.in @@ -26,6 +26,7 @@ AC_SUBST(SUDO_LIBS) AC_SUBST(SUDOERS_LIBS) AC_SUBST(NET_LIBS) AC_SUBST(AFS_LIBS) +AC_SUBST(REPLAY_LIBS) AC_SUBST(GETGROUPS_LIB) AC_SUBST(OSDEFS) AC_SUBST(AUTH_OBJS) @@ -1944,7 +1945,7 @@ SUDO_FUNC_ISBLANK AC_REPLACE_FUNCS(memrchr strerror strcasecmp sigaction strlcpy strlcat strdup strndup) AC_CHECK_FUNCS(nanosleep, [], [ # On Solaris, nanosleep is in librt - AC_CHECK_LIB(rt, nanosleep, [LIBS="${LIBS} -lrt"], [AC_LIBOBJ(nanosleep)]) + AC_CHECK_LIB(rt, nanosleep, [REPLAY_LIBS="${REPLAY_LIBS} -lrt"], [AC_LIBOBJ(nanosleep)]) ]) AC_CHECK_FUNCS(closefrom, [], [AC_LIBOBJ(closefrom) AC_CHECK_DECL(F_CLOSEM, AC_DEFINE(HAVE_FCNTL_CLOSEM), [], diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index f2a741bef..407545581 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -45,6 +45,7 @@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c LIBS = $(top_srcdir)/@ac_config_libobj_dir@/libreplace.la NET_LIBS = @NET_LIBS@ SUDOERS_LIBS = @SUDOERS_LIBS@ @AFS_LIBS@ @GETGROUPS_LIB@ $(LIBS) $(NET_LIBS) +REPLAY_LIBS = @REPLAY_LIBS@ # C preprocessor flags CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) @CPPFLAGS@ @@ -144,7 +145,7 @@ visudo: libsudoers.la $(VISUDO_OBJS) $(LIBTOOL) --mode=link $(CC) -o $@ $(VISUDO_OBJS) $(LDFLAGS) libsudoers.la $(LIBS) $(NET_LIBS) sudoreplay: libsudoers.la $(REPLAY_OBJS) - $(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) libsudoers.la $(LIBS) @ZLIB@ + $(LIBTOOL) --mode=link $(CC) -o $@ $(REPLAY_OBJS) $(LDFLAGS) $(REPLAY_LIBS) libsudoers.la $(LIBS) @ZLIB@ testsudoers: $(TEST_OBJS) $(LIBTOOL) --mode=link $(CC) -o $@ $(TEST_OBJS) $(LDFLAGS) libsudoers.la $(LIBS) $(NET_LIBS)