Try to fix IRIX build - add quotes and never call libns_winbind by name - we

should only set that name once.
(This used to be commit 34f15bff6f4f847eb900174793dcbc638f96a5bd)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 64e74fe10d68609089202756d7917f05f3029daa..4f08187f331308293454bb0c986f6f68893685cc 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -962,7 +962,7 @@ nsswitch/libnss_wins.@SHLIBEXT@: $(NSS_OBJ)
                @SONAMEFLAG@`basename $@`
 
 bin/winbindd@EXEEXT@: $(WINBINDD_OBJ) @BUILD_POPT@ bin/.dummy
-       @echo Linking $@
+       @echo "Linking $@"
        @$(LINK) -o $@ $(WINBINDD_OBJ) $(DYNEXP) $(LIBS) @POPTLIBS@ $(ADSLIBS) \
                @LDAP_LIBS@
 
@@ -972,7 +972,7 @@ nsswitch/@WINBIND_NSS@.@SHLIBEXT@: $(WINBIND_NSS_PICOBJS)
                @WINBIND_NSS_EXTRA_LIBS@ @SONAMEFLAG@`basename $@`
 
 nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ) bin/.dummy
-       @echo Linking $@
+       @echo "Linking $@"
        @$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) \
                @SONAMEFLAG@`basename $@` -lpam
 

diff --git a/source3/configure.in b/source3/configure.in
index fa9393d9529db10d11ef3584963cebcba430fe74..c568fc17d53e6f566cca0a5a08d2d86d8ac6f3cf 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3270,10 +3270,10 @@ if test x"$HAVE_WINBIND" = x"yes"; then
         if test x"$BLDSHARED" = x"true"; then
                case "$host_os" in
                *irix*)
-                       SHLIB_PROGS="$SHLIB_PROGS nsswitch/libns_winbind.$SHLIBEXT"
+                       SHLIB_PROGS="$SHLIB_PROGS nsswitch/$WINBIND_NSS.$SHLIBEXT"
                        ;;
                *)
-                       SHLIB_PROGS="$SHLIB_PROGS nsswitch/libnss_winbind.$SHLIBEXT"
+                       SHLIB_PROGS="$SHLIB_PROGS nsswitch/$WINBIND_NSS.$SHLIBEXT"
                        ;;
                esac
                if test x"$with_pam" = x"yes"; then