From 32bdf68ff8c0aeac735f28c4712261990f81612c Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Fri, 8 Sep 2000 18:02:10 -0500 Subject: [svn-r2529] Added a -R flag to the LT command line. If we compile with zlib, and zlib isn't in our LD_LIBRARY_PATH or in a standard system library place (/usr/lib or /lib), then the tests can't run. This fixes it if the person configures the source with the flag: --with-zlib=/usr/fnord/include,/usr/fnord/lib This only works if you're pointing to the shared library version in the above flag... --- test/Makefile.in | 73 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/test/Makefile.in b/test/Makefile.in index eba7699..1e20178 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -27,7 +27,6 @@ TIMINGS=iopipe chunk ragged overhead ## The libh5test.a library provides common support code for the tests. We link ## this library statically because some systems can only link executables to ## a single shared library and libhdf5 is much bigger than libh5test. -LT_LINK_LIB=$(LT) --mode=link $(CC) -static -rpath $(libdir) LIBHDF5=../src/libhdf5.la LIB=libh5test.la LIB_SRC=h5test.c @@ -81,6 +80,8 @@ timings _timings: $(TIMINGS) fi; \ done; +ZLIB_DIR=@ZLIB_DIR@ + ## How to build the tests... They all depend on the test and hdf5 libraries. $(TEST_PROGS): $(LIB) $(LIBHDF5) @@ -90,109 +91,109 @@ TTS_OBJ=ttsafe.lo ttsafe_dcreate.lo ttsafe_error.lo ttsafe_cancel.lo \ ttsafe_acreate.lo testhdf5: $(TESTHDF5_OBJ) - @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ $(TESTHDF5_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) lheap: lheap.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ lheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ lheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) ohdr: ohdr.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ ohdr.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ ohdr.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) stab: stab.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ stab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ stab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) gheap: gheap.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ gheap.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) dsets: dsets.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dsets.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ dsets.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) bittests: bittests.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ bittests.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ bittests.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) dtypes: dtypes.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dtypes.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ dtypes.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) hyperslab: hyperslab.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ hyperslab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ hyperslab.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) istore: istore.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ istore.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ istore.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) cmpd_dset: cmpd_dset.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ cmpd_dset.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ cmpd_dset.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) extend: extend.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ extend.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ extend.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) external: external.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ external.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ external.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) iopipe: iopipe.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ iopipe.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ iopipe.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) big: big.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ big.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ big.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) links: links.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ links.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ links.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) chunk: chunk.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ chunk.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ chunk.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) mtime: mtime.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ mtime.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ mtime.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) ragged: ragged.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ ragged.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ ragged.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) unlink: unlink.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ unlink.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ unlink.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) overhead: overhead.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ overhead.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ overhead.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) fillval: fillval.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ fillval.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ fillval.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) mount: mount.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ mount.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ mount.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) flush1: flush1.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush1.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ flush1.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) flush2: flush2.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ flush2.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ flush2.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) enum: enum.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ enum.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ enum.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) ttsafe: $(TTS_OBJ) - @$(LT_LINK_EXE) $(CFLAGS) -o $@ $(TTS_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ $(TTS_OBJ) $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) gass_write: gass_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ gass_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) gass_read: gass_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ gass_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) gass_append: gass_append.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ gass_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ gass_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) dpss_read: dpss_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dpss_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ dpss_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) dpss_write: dpss_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ dpss_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ dpss_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) srb_read: srb_read.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ srb_read.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) srb_write: srb_write.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ srb_write.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) srb_append: srb_append.lo - @$(LT_LINK_EXE) $(CFLAGS) -o $@ srb_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) + @$(LT_LINK_EXE) -R$(ZLIB_DIR) $(CFLAGS) -o $@ srb_append.lo $(LIB) $(LIBHDF5) $(LDFLAGS) $(LIBS) @CONCLUDE@ -- cgit v0.12