diff options
| author | Gerald (Jerry) Carter <jerry@samba.org> | 2007-12-21 13:50:13 -0600 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-12-21 13:50:13 -0600 |
| commit | 98b21126a76991a011ccbfd9553e653ea6304cec (patch) | |
| tree | 13dce729edd9c41096e285492158bc1d451da097 | |
| parent | 387288e9501cd211500b1c5cf1bc0a339017a4a4 (diff) | |
| download | samba-98b21126a76991a011ccbfd9553e653ea6304cec.tar.gz samba-98b21126a76991a011ccbfd9553e653ea6304cec.tar.bz2 samba-98b21126a76991a011ccbfd9553e653ea6304cec.zip | |
Fix "make test" using the LD_LIBRARY_PATH for selftest script so
smbd can locate the libwbclient library (if neccessary).
(This used to be commit 481cc9ab6a6608e13710c93783ea4e62363e78be)
| -rw-r--r-- | source3/Makefile.in | 5 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index f98672f246..5c41a5b66c 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -1331,11 +1331,11 @@ bin/nsstest@EXEEXT@: $(BINARY_PREREQS) $(NSSTEST_OBJ) @BUILD_POPT@ bin/pdbtest@EXEEXT@: $(BINARY_PREREQS) $(PDBTEST_OBJ) @BUILD_POPT@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ + @$(CC) $(FLAGS) -o $@ $(PDBTEST_OBJ) $(LDFLAGS) $(DYNEXP) $(LIBS) $(KRB5LIBS) $(LDAP_LIBS) $(PASSDB_LIBS) $(LIBS) @POPTLIBS@ @LIBWBCLIENT_SHARED@ bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) + @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINT_LIBS) $(AUTH_LIBS) $(ACL_LIBS) $(LIBS) @POPTLIBS@ $(KRB5LIBS) $(LDAP_LIBS) @SMBD_LIBS@ $(NSCD_LIBS) @LIBWBCLIENT_SHARED@ bin/smbiconv@EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ @echo Linking $@ @@ -1396,6 +1396,7 @@ bin/libwbclient.@SHLIBEXT@: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @echo Linking shared library $@ @$(SHLD_DSO) $(LIBWBCLIENT_OBJ) \ @SONAMEFLAG@`basename $@`.$(SONAME_VER) + @ln -s `basename $@` $@.$(SONAME_VER) bin/libwbclient.a: $(BINARY_PREREQS) $(LIBWBCLIENT_OBJ) @echo Linking non-shared library $@ diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index 2250a81245..0ad0639cb9 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -70,6 +70,10 @@ export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR PATH=bin:$PATH export PATH +LD_LIBRARY_PATH=$BINDIR +echo "LD_LIBRRARY_PATH=$LD_LIBRARY_PATH" +export LD_LIBRARY_PATH + ## ## verify that we were built with --enable-socket-wrapper ## |