merge from 2.2

don't set WINBIND variables unless configure was run --with-winbind
(This used to be commit 83ec4c0f4dbfa43c893f18af1c6bb58c55043c9b)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 500c6d5415e1d3a29964a29bb4e3b4a2f3b7e43d..541bfce7c926344e5de7ae0d0488e74ad5aa56b8 100644 (file)
--- 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

diff --git a/source3/configure b/source3/configure
index e85543e6932049eda21e9d445680bac1e6747a18..c08a639d460c7ed8e5dddba0e937216d13242dc0 100755 (executable)
--- 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

diff --git a/source3/configure.in b/source3/configure.in
index a306c8c4798ef5108905dc356cc249d5efb5bb48..abee509bea4f5a43f273fe5182c577c88fbb4acb 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2488,12 +2488,12 @@ if test x"$HAVE_WINBIND" = x"yes"; then
 
         AC_MSG_RESULT(yes)
 
-       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
@@ -2510,7 +2510,7 @@ fi
 AC_SUBST(WINBIND_TARGETS)
 AC_SUBST(WINBIND_STARGETS)
 AC_SUBST(WINBIND_LTARGETS)
-AC_SUBST(WINBIND_PAM_PROGS)
+AC_SUBST(WINBIND_PAM_TARGETS)
 
 #################################################
 # Check to see if we should use the included popt