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/Makefile.in | |
| 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/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 500c6d5415..541bfce7c9 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -85,16 +85,16 @@ PATH_FLAGS4 = $(PATH_FLAGS3) -DSWATDIR=\"$(SWATDIR)\" -DLOCKDIR=\"$(LOCKDIR)\" PATH_FLAGS5 = $(PATH_FLAGS4) -DLIBDIR=\"$(LIBDIR)\" -DLOGFILEBASE=\"$(LOGFILEBASE)\" PATH_FLAGS = $(PATH_FLAGS5) $(PASSWD_FLAGS) -WINBIND_PROGS = bin/wbinfo -WINBIND_SPROGS = bin/winbindd -WINBIND_PAM_PROGS = nsswitch/pam_winbind.so -WINBIND_LPROGS = @WINBIND_PAM_PROGS@ nsswitch/libnss_winbind.so +WINBIND_PROGS = @WINBIND_TARGETS@ +WINBIND_SPROGS = @WINBIND_STARGETS@ +WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@ +WINBIND_LPROGS = @WINBIND_LTARGETS@ SPROGS = bin/smbd bin/nmbd bin/swat @WINBIND_STARGETS@ PROGS1 = bin/smbclient bin/net bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/smbtree @RUNPROG@ @WINBIND_TARGETS@ PROGS2 = bin/smbpasswd bin/rpcclient bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ MPROGS = @MPROGS@ -LPROGS = @WINBIND_LTARGETS@ +LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS) PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup bin/pdbedit bin/smbgroupedit TORTURE_PROGS = bin/smbtorture bin/msgtest bin/masktest bin/locktest bin/locktest2 @@ -450,7 +450,7 @@ POPT_OBJS=popt/findme.o popt/popt.o popt/poptconfig.o \ ###################################################################### # now the rules... ###################################################################### -all : SHOWFLAGS include/proto.h $(SPROGS) $(PROGS) $(SHLIBS) nsswitch +all : SHOWFLAGS include/proto.h $(SPROGS) $(PROGS) $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) $(SHLIBS) pam_smbpass : SHOWFLAGS bin/pam_smbpass.@SHLIBEXT@ @@ -476,7 +476,7 @@ debug2html : SHOWFLAGS bin/debug2html smbfilter : SHOWFLAGS bin/smbfilter -nsswitch : SHOWFLAGS @WINBIND_TARGETS@ @WINBIND_STARGETS@ @WINBIND_LTARGETS@ +nsswitch : SHOWFLAGS $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) .SUFFIXES: .SUFFIXES: .c .o .po .po32 .lo |