diff options
| -rw-r--r-- | source/Makefile.in | 12 | ||||
| -rwxr-xr-x | source/configure | 14 | ||||
| -rw-r--r-- | source/configure.in | 9 |
3 files changed, 22 insertions, 13 deletions
diff --git a/source/Makefile.in b/source/Makefile.in index 08ff278bd17..82f250d6d8f 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -78,13 +78,15 @@ FLAGS5 = $(FLAGS1) $(FLAGS2) $(FLAGS3) $(FLAGS4) -DHAVE_INCLUDES_H FLAGS = $(ISA) $(FLAGS5) $(PASSWD_FLAGS) FLAGS32 = $(ISA32) $(FLAGS5) $(PASSWD_FLAGS) -SPROGS = bin/smbd bin/nmbd bin/swat -PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/make_printerdef @RUNPROG@ +WINBIND_PROGS = bin/wbinfo +WINBIND_SPROGS = bin/winbindd nsswitch/libnss_winbind.so +WINBIND_PAM_PROGS = nsswitch/pam_winbind.so + +SPROGS = bin/smbd bin/nmbd bin/swat @WINBIND_STARGETS@ +PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/make_printerdef @RUNPROG@ @WINBIND_TARGETS@ PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @WRAP@ @WRAP32@ @PAM_MOD@ MPROGS = @MPROGS@ -WINBIND_PROGS = nsswitch/libnss_winbind.so bin/winbindd bin/wbinfo -WINBIND_PAM_PROGS = nsswitch/pam_winbind.so -PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup @WINBIND_TARGETS@ +PROGS = $(PROGS1) $(PROGS2) $(MPROGS) bin/nmblookup SCRIPTS = $(srcdir)/script/smbtar diff --git a/source/configure b/source/configure index 88860a8afa1..923f0a51b4d 100755 --- a/source/configure +++ b/source/configure @@ -12198,10 +12198,11 @@ echo "configure:12198: checking whether to compile winbind" >&5 case "$host_os" in *linux*|*solaris*) - WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PROGS)" + WINBIND_TARGETS="\$(WINBIND_PROGS)" + WINBIND_STARGETS="\$(WINBIND_SPROGS)" case "$with_pam" in yes) - WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PAM_PROGS)" + WINBIND_STARGETS="$WINBIND_STARGETS \$(WINBIND_PAM_PROGS)" ;; *) esac @@ -12218,7 +12219,8 @@ if test "${with_winbind+set}" = set; then case "$withval" in no) WINBIND_TARGETS="" - winbind_reason="" + WINBIND_STARGETS="" + winbind_reason="" ;; esac fi @@ -12232,6 +12234,7 @@ fi + ################################################# # final configure stuff echo "checking configure summary" @@ -12239,11 +12242,11 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 12243 "configure" +#line 12246 "configure" #include "confdefs.h" #include "${srcdir-.}/tests/summary.c" EOF -if { (eval echo configure:12247: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:12250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "configure OK"; else @@ -12435,6 +12438,7 @@ s%@TERMLDFLAGS@%$TERMLDFLAGS%g s%@ROFF@%$ROFF%g s%@QUOTAOBJS@%$QUOTAOBJS%g s%@WINBIND_TARGETS@%$WINBIND_TARGETS%g +s%@WINBIND_STARGETS@%$WINBIND_STARGETS%g s%@builddir@%$builddir%g CEOF diff --git a/source/configure.in b/source/configure.in index 45e0e239178..2ba6bcf71d3 100644 --- a/source/configure.in +++ b/source/configure.in @@ -2270,10 +2270,11 @@ AC_MSG_CHECKING(whether to compile winbind) case "$host_os" in *linux*|*solaris*) - WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PROGS)" + WINBIND_TARGETS="\$(WINBIND_PROGS)" + WINBIND_STARGETS="\$(WINBIND_SPROGS)" case "$with_pam" in yes) - WINBIND_TARGETS="$WINBIND_TARGETS \$(WINBIND_PAM_PROGS)" + WINBIND_STARGETS="$WINBIND_STARGETS \$(WINBIND_PAM_PROGS)" ;; *) esac @@ -2290,7 +2291,8 @@ AC_ARG_WITH(winbind, case "$withval" in no) WINBIND_TARGETS="" - winbind_reason="" + WINBIND_STARGETS="" + winbind_reason="" ;; esac ], ) @@ -2302,6 +2304,7 @@ else fi AC_SUBST(WINBIND_TARGETS) +AC_SUBST(WINBIND_STARGETS) ################################################# # final configure stuff |