From: Todd C. Miller Date: Fri, 19 Mar 2010 11:32:14 +0000 (-0400) Subject: Fix --with-ldap X-Git-Tag: SUDO_1_8_0~787 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0dbf4362d954a2f4c27110a230811a2f69e59d48;p=sudo Fix --with-ldap --- diff --git a/configure b/configure index a154256a1..2857e6a90 100755 --- a/configure +++ b/configure @@ -812,6 +812,7 @@ SUDOERS_LDFLAGS SUDOERS_OBJS SUDO_OBJS SUDO_LIBS +SUDOERS_LIBS NET_LIBS AFS_LIBS GETGROUPS_LIB @@ -2132,6 +2133,7 @@ echo "$as_me: Configuring Sudo version $PACKAGE_VERSION" >&6;} + timeout=5 @@ -6608,7 +6610,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6611 "configure"' > conftest.$ac_ext + echo '#line 6613 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8472,11 +8474,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:8475: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8477: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8479: \$? = $ac_status" >&5 + echo "$as_me:8481: \$? = $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. @@ -8762,11 +8764,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:8765: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8767: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8769: \$? = $ac_status" >&5 + echo "$as_me:8771: \$? = $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. @@ -8866,11 +8868,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:8869: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8871: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8873: \$? = $ac_status" >&5 + echo "$as_me:8875: \$? = $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 @@ -11226,7 +11228,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_N "checking for LDAP libraries... $ECHO_C" >&6; } @@ -26108,7 +26110,7 @@ echo "$as_me: WARNING: Unable to locate gssapi.h, you will have to edit the Make fi fi - SUDO_LIBS="${SUDO_LIBS} ${LDAP_LIBS}" + SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}" LIBS="$_LIBS" LDFLAGS="$_LDFLAGS" fi @@ -26961,6 +26963,7 @@ SUDOERS_LDFLAGS!$SUDOERS_LDFLAGS$ac_delim SUDOERS_OBJS!$SUDOERS_OBJS$ac_delim SUDO_OBJS!$SUDO_OBJS$ac_delim SUDO_LIBS!$SUDO_LIBS$ac_delim +SUDOERS_LIBS!$SUDOERS_LIBS$ac_delim NET_LIBS!$NET_LIBS$ac_delim AFS_LIBS!$AFS_LIBS$ac_delim GETGROUPS_LIB!$GETGROUPS_LIB$ac_delim @@ -27010,7 +27013,6 @@ mail_no_perms!$mail_no_perms$ac_delim mailto!$mailto$ac_delim mailsub!$mailsub$ac_delim badpass_message!$badpass_message$ac_delim -fqdn!$fqdn$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -27052,6 +27054,7 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +fqdn!$fqdn$ac_delim runas_default!$runas_default$ac_delim env_editor!$env_editor$ac_delim passwd_tries!$passwd_tries$ac_delim @@ -27099,7 +27102,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` = 45; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 46; 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 acc8fcdee..7a1d449c6 100644 --- a/configure.in +++ b/configure.in @@ -23,6 +23,7 @@ AC_SUBST(SUDOERS_OBJS) AC_SUBST(SUDO_OBJS) AC_SUBST(LIBS) AC_SUBST(SUDO_LIBS) +AC_SUBST(SUDOERS_LIBS) AC_SUBST(NET_LIBS) AC_SUBST(AFS_LIBS) AC_SUBST(GETGROUPS_LIB) @@ -2529,7 +2530,7 @@ if test ${with_ldap-'no'} != "no"; then with_ldap=yes LDAP="" fi - SUDOERS_OBJS="${SUDOERS_OBJS} ldap.o" + SUDOERS_OBJS="${SUDOERS_OBJS} ldap.lo" AC_MSG_CHECKING([for LDAP libraries]) LDAP_LIBS="" @@ -2594,7 +2595,7 @@ if test ${with_ldap-'no'} != "no"; then fi fi - SUDO_LIBS="${SUDO_LIBS} ${LDAP_LIBS}" + SUDOERS_LIBS="${SUDOERS_LIBS} ${LDAP_LIBS}" LIBS="$_LIBS" LDFLAGS="$_LDFLAGS" fi diff --git a/plugins/sudoers/Makefile.in b/plugins/sudoers/Makefile.in index 5e42057bd..0b4cefbbb 100644 --- a/plugins/sudoers/Makefile.in +++ b/plugins/sudoers/Makefile.in @@ -36,6 +36,7 @@ INSTALL = $(SHELL) $(top_srcdir)/install-sh -c # Libraries LIBS = $(LIBOBJDIR)/libreplace.la +SUDOERS_LIBS = @SUDOERS_LIBS@ $(LIBS) # C preprocessor flags CPPFLAGS = -I$(incdir) -I$(top_builddir) -I$(srcdir) @CPPFLAGS@ @@ -45,6 +46,7 @@ CFLAGS = @CFLAGS@ # Flags to pass to the link stage LDFLAGS = +SUDOERS_LDFLAGS = @SUDOERS_LDFLAGS@ # Where to install things... prefix = @prefix@ @@ -109,7 +111,7 @@ all: sudoers.la $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(CFLAGS) $(DEFS) $(OPTIONS) $< sudoers.la: $(SUDOERS_OBJS) $(COMMON_OBJS) - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(SUDOERS_OBJS) $(COMMON_OBJS) $(LIBS) -module -avoid-version -rpath $(plugindir) + $(LIBTOOL) --mode=link $(CC) $(SUDOERS_LDFLAGS) -o $@ $(SUDOERS_OBJS) $(COMMON_OBJS) $(SUDOERS_LIBS) -module -avoid-version -rpath $(plugindir) # Sudoers dependencies sudoers.lo: $(srcdir)/sudoers.c $(SUDODEP) $(srcdir)/interfaces.h