svn commit: samba r23315 - in branches/SAMBA_3_0/source: .

[Stefan (metze) Metzmacher]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

metze at samba.org schrieb:
> Author: metze
> Date: 2007-06-03 16:21:40 +0000 (Sun, 03 Jun 2007)
> New Revision: 23315
> 
> WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23315
> 
> Log:
> - don't use the builtin and -liniparser together in bin/net
> - unify handling on @BUILD_INIPARSER@
> 
> btw: nsswitch/pam_winbind.c doesn't compile anymore on SuSE 10.2!
>      I think we should build pam modules by default to notice things
>      like this in the build-farm...
> 
> metze
> Modified:
>    branches/SAMBA_3_0/source/Makefile.in
> 
> 
> Changeset:
> Modified: branches/SAMBA_3_0/source/Makefile.in
> ===================================================================
> --- branches/SAMBA_3_0/source/Makefile.in	2007-06-03 15:51:09 UTC (rev 23314)
> +++ branches/SAMBA_3_0/source/Makefile.in	2007-06-03 16:21:40 UTC (rev 23315)
> @@ -613,7 +613,7 @@
>  	     $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(LDB_OBJ)
>  
>  PAM_WINBIND_OBJ = nsswitch/pam_winbind.o $(WBCOMMON_OBJ) \
> -		  $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ) @BUILD_INIPARSER@
> +		  $(LIBREPLACE_OBJ) $(SOCKET_WRAPPER_OBJ)
>  
>  LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o libsmb/libsmb_compat.o \
>  		   libsmb/libsmb_cache.o \
> @@ -685,8 +685,7 @@
>  	  $(LIBADS_OBJ) $(LIBADS_SERVER_OBJ) $(POPT_LIB_OBJ) \
>  	  $(SMBLDAP_OBJ) $(DCUTIL_OBJ) $(SERVER_MUTEX_OBJ) \
>  	  $(AFS_OBJ) $(AFS_SETTOKEN_OBJ) $(REGFIO_OBJ) $(READLINE_OBJ) \
> -	  $(LDB_OBJ) $(LIBGPO_OBJ) $(INIPARSER_OBJ) $(DISPLAY_SEC_OBJ) \
> -	  $(NET_REG_OBJ)
> +	  $(LDB_OBJ) $(LIBGPO_OBJ) $(DISPLAY_SEC_OBJ) $(NET_REG_OBJ)
>  
>  CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) \
>  	  $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(SECRETS_OBJ)
> @@ -1476,7 +1475,7 @@
>  		$(LDAP_LIBS) $(LIBS) -lcom_err \
>  		@SONAMEFLAG@`basename $@`
>  
> -bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ)
> +bin/pam_winbind. at SHLIBEXT@: $(BINARY_PREREQS) $(PAM_WINBIND_OBJ) @BUILD_INIPARSER@
>  	@echo "Linking shared library $@"
>  	@$(SHLD) $(LDSHFLAGS) -o $@ $(PAM_WINBIND_OBJ) -lpam @INIPARSERLIBS@ $(GPLIBS) \
>  		@SONAMEFLAG@`basename $@`
> 
I'll merge this together with the other fix tomorrow...

btw: what is $(GPLIBS) we never define it somewhere in Makefile...

metze

metze
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org

iD8DBQFGYutHm70gjA5TCD8RAhtKAJ9sHfkIWaogRxmgEmL2eyA3PNJaFgCeOhfe
2Uv08yeGAX311ndATZWjuBc=
=CWOc
-----END PGP SIGNATURE-----