[SCM] Samba Shared Repository - branch master updated - 1c6aa01e1f2f5e7ec1a55aace9392622d91b04c5

Michael Adam obnox at samba.org
Mon Oct 27 12:01:00 GMT 2008


The branch, master has been updated
       via  1c6aa01e1f2f5e7ec1a55aace9392622d91b04c5 (commit)
      from  71a2e02cf1b8523442ca67dffa34889ca708b836 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 1c6aa01e1f2f5e7ec1a55aace9392622d91b04c5
Author: Michael Adam <obnox at samba.org>
Date:   Mon Oct 27 12:59:11 2008 +0100

    [s3]build: fix bug #5677 - fix test_{shlibs,nss_modules,pam_modules} on Solaris
    
    and other systems where sh does not support "export FOO=bar"
    by separating setting and exporting the variable.
    
    Thanks to Yasuma Takeda <yasuma at osstech.co.jp> for the patch.
    
    Michael

-----------------------------------------------------------------------

Summary of changes:
 source3/Makefile.in |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index ac9770d..ace1bd8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2801,7 +2801,8 @@ Makefile: $(srcdir)/Makefile.in config.status
 # Check shared libs for unresolved symbols
 test_shlibs:
 	@echo "Testing $? "
-	@export $(LIB_PATH_VAR)=./bin && \
+	@$(LIB_PATH_VAR)=./bin && \
+	export $(LIB_PATH_VAR) && \
 	for module in $?; do \
 		./script/tests/dlopen.sh $${module} \
 			|| exit 1; \
@@ -2810,7 +2811,8 @@ test_shlibs:
 # Check for NSS module problems.
 test_nss_modules:: nss_modules
 	@echo "Testing $(NSS_MODULES) "
-	@export $(LIB_PATH_VAR)=./bin && \
+	@$(LIB_PATH_VAR)=./bin && \
+	export $(LIB_PATH_VAR) && \
 	for module in $(NSS_MODULES); do \
 		./script/tests/dlopen.sh $${module} \
 			|| exit 1; \
@@ -2820,7 +2822,8 @@ test_nss_modules:: nss_modules
 # built can actually be loaded by a minimal PAM-aware application.
 test_pam_modules:: pam_modules
 	@echo "Testing $(PAM_MODULES) "
-	@export $(LIB_PATH_VAR)=./bin && \
+	@$(LIB_PATH_VAR)=./bin && \
+	export $(LIB_PATH_VAR) && \
 	for module in $(PAM_MODULES); do \
 		./script/tests/dlopen.sh -lpam -ldl bin/$${module}. at SHLIBEXT@ \
 			|| exit 1; \


-- 
Samba Shared Repository


More information about the samba-cvs mailing list