diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2011-04-15 22:08:30 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2011-04-15 22:08:30 (GMT) |
| commit | 27a7f563f1d199bb6f38c12978981518ad445f92 (patch) | |
| tree | 52737db97a4dd76d0dc9149f5e97d2690463dd6d /examples | |
| parent | 48079fa0fa7c8274aa36d0f4f0ac82ade23e5b8c (diff) | |
| download | hdf5-27a7f563f1d199bb6f38c12978981518ad445f92.zip hdf5-27a7f563f1d199bb6f38c12978981518ad445f92.tar.gz hdf5-27a7f563f1d199bb6f38c12978981518ad445f92.tar.bz2 | |
[svn-r20530] Updated configure.in to check for a non-empty LL_PATH in addition to using szip before attempting to export LL_PATH as LD_LIBRARY_PATH in the examples and hl/examples Makefiles. This fixes a probelm that caused make install or installcheck on FreeBSD machines.
Tested on freedom and jam.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index 8a428ae..c249526 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -97,7 +97,7 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS) h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS) h5_shared_mesg: $(srcdir)/h5_shared_mesg.c -if BUILD_SZIP_CONDITIONAL +if BUILD_SHARED_SZIP_CONDITIONAL export LD_LIBRARY_PATH=$(LL_PATH) endif diff --git a/examples/Makefile.in b/examples/Makefile.in index 5a6d3ed..1c891b6 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -658,7 +658,7 @@ h5_extlink: $(srcdir)/h5_extlink.c $(EXTLINK_DIRS) h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS) h5_shared_mesg: $(srcdir)/h5_shared_mesg.c -@BUILD_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) +@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): |