PATCH: "make check" with libzsh (e.g. FreeBSD)

["Bart Schaefer" <schaefer@xxxxxxxxxxxxxxxxxxxxxxx>]

In zsh-workers/14451, Andrej wrote:
} 
} On Wed, 23 May 2001, Oliver Kiddle wrote:
} 
} > x86 FreeBSD 4.2-stable
} >
} > make check yields several
} > /usr/libexec/ld-elf.so.1: Shared object "libzsh-4.0.1-pre-5.so" not found
} >
} > It seems that make check uses a `make install.modules' but libzsh is
} > installed as part of `make install.bin'. We need to fix this but I'm not
} > sure I fully understand this part of the Makefiles. Isn't this an issue
} > for cygwin?
} >
} 
} No, it was there long before. I suspect, that tests were never run on a
} system that needed libzsh (or already installed version was silently
} used).
} 
} Exactly on Cygwin it runs correctly, because it tries first to find DLL in
} the same directory as executable.

Does this patch fix it?  Unfortunately $(DLLD) is the only reasonable
symbol to test that is available in Test/Makefile; $(LIBZSH) is defined in
Src/Makefile.in only.  So this may needlessly export LD_LIBRARY_PATH on a
system that does not require libzsh, but that should be harmless, right?

Index: Test/Makefile.in
===================================================================
diff -c -r1.1.1.1 Test/Makefile.in
--- Test/Makefile.in	2001/04/09 20:14:14	1.1.1.1
+++ Test/Makefile.in	2001/06/02 15:29:29
@@ -45,7 +45,11 @@
 	  cd $(dir_top) && \
 	  $(MAKE) MODDIR=`pwd`/$(subdir)/Modules install.modules > /dev/null; \
 	fi
-	-for f in $(sdir)/$(TESTNUM)*.ztst; do \
+	-if test -n "$(DLLD)"; then \
+	  LD_LIBRARY_PATH="`cd $(dir_top); pwd`/Src:$$LD_LIBRARY_PATH"; \
+	  export LD_LIBRARY_PATH; \
+	fi; \
+	for f in $(sdir)/$(TESTNUM)*.ztst; do \
 	  $(dir_top)/Src/zsh +Z -f $(sdir)/ztst.zsh $$f; \
 	done
 	rm -rf Modules .zcompdump

-- 
Bart Schaefer                                 Brass Lantern Enterprises
http://www.well.com/user/barts              http://www.brasslantern.com

Zsh: http://www.zsh.org | PHPerl Project: http://phperl.sourceforge.net