summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-04-09 04:05:42 +0000
committerTim Potter <tpot@samba.org>2003-04-09 04:05:42 +0000
commite725e6a0b793ca7efdaef0acdcb23b264b9c5c34 (patch)
treefb000368d6d7a64596b6f348deb2f14f03dfc1ee /source3
parent117b2d78f030df2ad16d4c399d122e60556cce00 (diff)
downloadsamba-e725e6a0b793ca7efdaef0acdcb23b264b9c5c34.tar.gz
samba-e725e6a0b793ca7efdaef0acdcb23b264b9c5c34.tar.bz2
samba-e725e6a0b793ca7efdaef0acdcb23b264b9c5c34.zip
Autoconfiscate the name of the winbind shared library file. Under
IRIX this is libns_winbind - everyone else is libnss_winbind. This simplifies the Makefile a bit and also fixes the 'nsswitch' target under IRIX. (This used to be commit 69c392bc127bf69876f4dedae8c3a6976219d448)
Diffstat (limited to 'source3')
-rw-r--r--source3/Makefile.in13
-rw-r--r--source3/configure.in4
2 files changed, 8 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index b9504f5b15..8301ca7eef 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -645,7 +645,7 @@ smbfilter : SHOWFLAGS bin/smbfilter@EXEEXT@
talloctort : SHOWFLAGS bin/talloctort@EXEEXT@
-nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ nsswitch/libnss_winbind.@SHLIBEXT@ nsswitch/pam_winbind.@SHLIBEXT@
+nsswitch : SHOWFLAGS bin/winbindd@EXEEXT@ bin/wbinfo@EXEEXT@ nsswitch/@WINBIND_NSS@.@SHLIBEXT@ nsswitch/pam_winbind.@SHLIBEXT@
wins : SHOWFLAGS nsswitch/libnss_wins.@SHLIBEXT@
@@ -952,15 +952,10 @@ bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
@$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS) \
@LDAP_LIBS@
-nsswitch/libns_winbind.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
+nsswitch/@WINBIND_NSS@.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
@echo "Linking $@"
- @$(SHLD) @LDSHFLAGS@ -o $@ $(WINBIND_NSS_PICOBJS) @WINBIND_NSS_EXTRA_LIBS@ \
- @SONAMEFLAG@`basename $@`
-
-nsswitch/libnss_winbind.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
- @echo "Linking $@"
- @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) @WINBIND_NSS_EXTRA_LIBS@ \
- @SONAMEFLAG@`basename $@`
+ @$(SHLD) $(LDSHFLAGS) -o $@ $(WINBIND_NSS_PICOBJS) \
+ @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
@echo Linking $@
diff --git a/source3/configure.in b/source3/configure.in
index b9e32d6208..2b086d3d3b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3222,12 +3222,15 @@ AC_MSG_CHECKING(whether to build winbind)
HAVE_WINBIND=yes
+WINBIND_NSS=libnss_winbind
+
case "$host_os" in
*linux*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_linux.o"
;;
*irix*)
WINBIND_NSS_EXTRA_OBJS="nsswitch/winbind_nss_irix.o"
+ WINBIND_NSS="libns_winbind"
;;
*solaris*)
# Solaris winbind client is implemented as a wrapper around
@@ -3248,6 +3251,7 @@ case "$host_os" in
;;
esac
+AC_SUBST(WINBIND_NSS)
AC_SUBST(WINBIND_NSS_EXTRA_OBJS)
AC_SUBST(WINBIND_NSS_EXTRA_LIBS)