From b372fd2cff0ba27db9a2e34a6bea15f1d0db9495 Mon Sep 17 00:00:00 2001 From: Lars Müller Date: Mon, 13 Mar 2006 14:22:43 +0000 Subject: r14317: Use source/bin as dir to link pam_winbind instead of source/nsswitch/ The intention is to have the resulting binaries at one place. This is also usefull for upcoming changes to provide a test_pammodules rule. With these changes I even got aware of testsuite/nsswitch/pam_winbind_syms.exp But this only covers pam_winbind. (This used to be commit 9883957b74ddefb5293e4aef0cc2f53ee4d417ac) --- source3/Makefile.in | 4 ++-- source3/configure.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source3') diff --git a/source3/Makefile.in b/source3/Makefile.in index 02d17b010b..c178fbaa85 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -788,7 +788,7 @@ eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@ talloctort : SHOWFLAGS bin/talloctort@EXEEXT@ nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ @WINBIND_NSS@ \ - @WINBIND_WINS_NSS@ nsswitch/pam_winbind.@SHLIBEXT@ + @WINBIND_WINS_NSS@ bin/pam_winbind.@SHLIBEXT@ wins : SHOWFLAGS @WINBIND_WINS_NSS@ @@ -1196,7 +1196,7 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy $(LDAP_LIBS) $(KRB5LIBS) \ @SONAMEFLAG@`basename $@`@SONAMEVERSIONSUFFIX@ -nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy +bin/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_PICOBJ) bin/.dummy @echo "Linking $@" @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_PICOBJ) \ @SONAMEFLAG@`basename $@` $(LIBS) -lpam diff --git a/source3/configure.in b/source3/configure.in index 37acc0c7e4..fd1648010d 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -5107,7 +5107,7 @@ if test x"$HAVE_WINBIND" = x"yes"; then SHLIB_PROGS="$SHLIB_PROGS $WINBIND_NSS $WINBIND_WINS_NSS" if test x"$with_pam" = x"yes"; then - SHLIB_PROGS="$SHLIB_PROGS nsswitch/pam_winbind.$SHLIBEXT" + SHLIB_PROGS="$SHLIB_PROGS bin/pam_winbind.$SHLIBEXT" fi fi else -- cgit