From 69c392bc127bf69876f4dedae8c3a6976219d448 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 9 Apr 2003 04:05:42 +0000
Subject: 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.
---
 source/Makefile.in  | 13 ++++---------
 source/configure.in |  4 ++++
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/source/Makefile.in b/source/Makefile.in
index b9504f5b158..8301ca7eef8 100644
--- a/source/Makefile.in
+++ b/source/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/source/configure.in b/source/configure.in
index b9e32d62089..2b086d3d3b1 100644
--- a/source/configure.in
+++ b/source/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)
 
-- 
cgit