$NetBSD: patch-aa,v 1.7 2005/06/19 18:38:40 taca Exp $

--- Makefile.in.orig	2004-01-22 20:24:22.000000000 +0900
+++ Makefile.in
@@ -117,6 +117,9 @@ LDSHFLAGSPO = @LDSHFLAGS@ @ARCHFLAGPO@
 LDSHFLAGS32 = @LDSHFLAGS@ @ARCHFLAG32@
 LDSHFLAGS64 = @LDSHFLAGS@ @ARCHFLAG64@
 
+PAM_NEEDS_LIBC = @PAM_NEEDS_LIBC@
+PAM_SMBPASS= @PAM_MOD@
+
 WINBIND_PROGS = @WINBIND_TARGETS@
 WINBIND_SPROGS = @WINBIND_STARGETS@
 WINBIND_PAM_PROGS = @WINBIND_PAM_TARGETS@
@@ -124,10 +127,10 @@ WINBIND_LPROGS = @WINBIND_LTARGETS@
 
 SPROGS = bin/smbd bin/nmbd bin/swat
 PROGS1 = bin/smbclient bin/smbspool bin/testparm bin/testprns bin/smbstatus bin/smbcontrol bin/tdbbackup bin/make_printerdef @RUNPROG@ 
-PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @PAM_MOD@ @PDBEDIT@
+PROGS2 = bin/smbpasswd bin/make_smbcodepage bin/rpcclient bin/make_unicodemap bin/smbcacls @PDBEDIT@
 MPROGS = @MPROGS@
 WPROGS = @WRAPPROG@ @WRAP@ @WRAP32@ @WRAP64@
-LPROGS = $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
+LPROGS = ${PAM_SMBPASS} $(WINBIND_PAM_PROGS) $(WINBIND_LPROGS)
 PROGS = $(PROGS1) $(PROGS2) $(MPROGS) $(WPROGS) bin/nmblookup
 TORTURE_PROGS = bin/smbtorture bin/msgtest bin/masktest bin/locktest bin/locktest2
 SHLIBS = @LIBSMBCLIENT@
@@ -465,7 +468,7 @@ TDBDUMP_OBJ =  tdb/tdbdump.o $(TDBBASE_O
 # now the rules...
 ######################################################################
 
-all : CHECK all-gettext-support $(SPROGS) $(PROGS) $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) $(BUILD_PROGS)
+all : CHECK all-gettext-support $(SPROGS) $(PROGS) $(SHLIBS) $(WINBIND_PROGS) $(WINBIND_SPROGS) $(LPROGS) $(BUILD_PROGS)
 
 # The following "everything" is NOT needed except by Samba developers - so do not use this!
 everything : CHECK all-gettext-support $(SPROGS) $(PROGS) $(SHLIBS) nsswitch smbwrapper smbtorture debug2html smbfilter $(BUILD_PROGS)
@@ -744,8 +747,8 @@ bin/smbwrapper.64.@SHLIBEXT@: $(PICOBJS6
 
 bin/libsmbclient.@SHLIBEXT@: $(LIBSMBCLIENT_PICOBJS) bin/.dummy
 	@echo Linking libsmbclient shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(LIBSMBCLIENT_PICOBJS) $(SOLIBS) \
-		@SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(LDFLAGS) $(LIBSMBCLIENT_PICOBJS) \
+		$(SOLIBS) @SONAMEFLAG@`basename $@`.$(LIBSMBCLIENT_MAJOR)
 
 bin/libsmbclient.a: $(LIBSMBCLIENT_PICOBJS) bin/.dummy
 	@echo Linking libsmbclient non-shared library $@
@@ -753,7 +756,7 @@ bin/libsmbclient.a: $(LIBSMBCLIENT_PICOB
 
 bin/pam_smbpass.@SHLIBEXT@: $(PAM_SMBPASS_OBJ) bin/.dummy
 	@echo Linking shared library $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(SHDYNEXP) $(SOLIBS) $(LDAPLIBS) -lc \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_SMBPASS_OBJ) -lpam $(SHDYNEXP) $(SOLIBS) $(LDAPLIBS) $(PAM_NEEDS_LIBC) \
 		@SONAMEFLAG@`basename $@`
 
 nsswitch/libnss_wins.@SHLIBEXT@: $(NSS_OBJ)
@@ -777,7 +780,7 @@ nsswitch/libnss_winbind.@SHLIBEXT@: $(WI
 
 nsswitch/pam_winbind.@SHLIBEXT@: $(PAM_WINBIND_OBJ)
 	@echo Linking $@
-	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) \
+	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) $(LDFLAGS) $(DYNEXP) $(PAM_NEEDS_LIBC) \
 		@SONAMEFLAG@`basename $@`
 
 bin/wbinfo: $(WBINFO_OBJ) $(PARAM_OBJ) $(LIB_OBJ) $(NOPROTO_OBJ) \
@@ -878,7 +881,7 @@ ipk-codepages-ja: $(BUILD_PROGS)
 	$(SHELL) $(srcdir)/script/mkipk.sh
 	-rm -rf $(IPKTMP)
 
-install: installbin installman installscripts installcp installswat install-gettext-support
+install: installbin installman installscripts installcp installswat install-gettext-support @INSTALLCLIENTLIB@
 # install: installbin installman installscripts installcp installswat install-gettext-support @INSTALLCLIENTLIB@
 
 installdirs:
@@ -916,11 +919,9 @@ installswat: installdirs
 	fi; done;
 
 installclientlib: @LIBSMBCLIENT@
-	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) ${prefix}/lib
-	-$(INSTALLCLIENTCMD_SH) @LIBSMBCLIENT_SHARED@ ${prefix}/lib
-	-$(INSTALLCLIENTCMD_A) @LIBSMBCLIENT_NON_SHARED@ ${prefix}/lib
-	$(SHELL) $(srcdir)/install-sh -d -m $(INSTALLPERMS) ${prefix}/include
-	-$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
+	$(INSTALLCLIENTCMD_SH) @LIBSMBCLIENT_SHARED@ ${prefix}/lib
+	$(INSTALLCLIENTCMD_A) @LIBSMBCLIENT_NON_SHARED@ ${prefix}/lib
+	$(INSTALLCMD) include/libsmbclient.h ${prefix}/include
 
 # revert to the previously installed version
 revert:
