diff options
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.in | 3 | ||||
| -rw-r--r-- | hl/examples/Makefile.am | 2 | ||||
| -rw-r--r-- | hl/examples/Makefile.in | 3 |
5 files changed, 5 insertions, 7 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 20521 2011-04-15 20:14:03Z acheng . +# From configure.in Id: configure.in 20531 2011-04-15 22:14:32Z nfortne2 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.68 for HDF5 1.8.7-snap2. # diff --git a/examples/Makefile.am b/examples/Makefile.am index c249526..9ec6a85 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -98,7 +98,7 @@ h5_elink_unix2win: $(srcdir)/h5_elink_unix2win.c $(EXTLINK_DIRS) h5_shared_mesg: $(srcdir)/h5_shared_mesg.c if BUILD_SHARED_SZIP_CONDITIONAL -export LD_LIBRARY_PATH=$(LL_PATH) +LD_LIBRARY_PATH=$(LL_PATH) endif include $(top_srcdir)/config/examples.am diff --git a/examples/Makefile.in b/examples/Makefile.in index 1c891b6..6eae57d 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -389,6 +389,7 @@ EXTLINK_DIRS = red blue u2w # Note: no '/' after DESTDIR. Explanation in commence.am EXAMPLEDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples/c EXAMPLETOPDIR = ${DESTDIR}$(exec_prefix)/share/hdf5_examples +@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH) # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. @@ -658,8 +659,6 @@ 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_SHARED_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) - # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am index fb0045f..ae65a3b 100644 --- a/hl/examples/Makefile.am +++ b/hl/examples/Makefile.am @@ -92,7 +92,7 @@ ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c if BUILD_SHARED_SZIP_CONDITIONAL -export LD_LIBRARY_PATH=$(LL_PATH) +LD_LIBRARY_PATH=$(LL_PATH) endif include $(top_srcdir)/config/examples.am diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 5c479ef..dc7133c 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -388,6 +388,7 @@ INSTALL_FILES = ex_lite1.c ex_lite2.c ex_lite3.c ptExampleFL.c ptExampleVL.c \ INSTALL_SCRIPT_FILES = run-hlc-ex.sh INSTALL_TOP_SCRIPT_FILES = run-hl-ex.sh +@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@LD_LIBRARY_PATH = $(LL_PATH) # Assume that all tests in this directory are examples, and tell # conclude.am when to build them. @@ -652,8 +653,6 @@ ex_table10: $(srcdir)/ex_table10.c ex_table11: $(srcdir)/ex_table11.c ex_table12: $(srcdir)/ex_table12.c -@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH) - # How to create EXAMPLEDIR if it doesn't already exist $(EXAMPLEDIR): -$(top_srcdir)/bin/mkdirs $@ |