diff options
| author | Herb Lewis <herb@samba.org> | 2001-12-05 21:08:17 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2001-12-05 21:08:17 +0000 |
| commit | 549e904d3fafe8f6884058d7804612ce329519bb (patch) | |
| tree | 8c8f7afb36f770f72b369230a21713587774a44b /source3/configure | |
| parent | f3e6f2d9536a7312729827d47e53f023bafb4ef5 (diff) | |
| download | samba-549e904d3fafe8f6884058d7804612ce329519bb.tar.gz samba-549e904d3fafe8f6884058d7804612ce329519bb.tar.bz2 samba-549e904d3fafe8f6884058d7804612ce329519bb.zip | |
merge from 2.2
don't set WINBIND variables unless configure was run --with-winbind
(This used to be commit 83ec4c0f4dbfa43c893f18af1c6bb58c55043c9b)
Diffstat (limited to 'source3/configure')
| -rwxr-xr-x | source3/configure | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/configure b/source3/configure index e85543e693..c08a639d46 100755 --- a/source3/configure +++ b/source3/configure @@ -13066,12 +13066,12 @@ if test x"$HAVE_WINBIND" = x"yes"; then echo "$ac_t""yes" 1>&6 - WINBIND_TARGETS="\$(WINBIND_PROGS)" - WINBIND_STARGETS="\$(WINBIND_SPROGS)" - WINBIND_LTARGETS="\$(WINBIND_LPROGS)" + WINBIND_TARGETS="bin/wbinfo" + WINBIND_STARGETS="bin/winbindd" + WINBIND_LTARGETS="nsswitch/libnss_winbind.so" case "$with_pam" in yes) - WINBIND_PAM_PROGS="\$(WINBIND_PAM_PROGS)" + WINBIND_PAM_TARGETS="nsswitch/pam_winbind.so" ;; esac else @@ -13372,7 +13372,7 @@ s%@manlangs@%$manlangs%g s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g s%@WINBIND_STARGETS@%$WINBIND_STARGETS%g s%@WINBIND_LTARGETS@%$WINBIND_LTARGETS%g -s%@WINBIND_PAM_PROGS@%$WINBIND_PAM_PROGS%g +s%@WINBIND_PAM_TARGETS@%$WINBIND_PAM_TARGETS%g s%@BUILD_POPT@%$BUILD_POPT%g s%@FLAGS1@%$FLAGS1%g s%@builddir@%$builddir%g |