[svn-r20640] Remove export from "export LD_LIBRARY_PATH=${LL_PATH}" in examples and hl/examples Makefiles.

  "export" breaks make install in Daily Tests on FreeBSD machines and isn't missed elsewhere.

Tested on amani, freedom, jam, heiwa, and loyalty.

6 files changed, 17 insertions, 19 deletions

diff --git a/configure b/configure
index 26bb1fe..88d841b 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 20502 2011-04-14 19:45:57Z mamcgree .
+# From configure.in Id: configure.in 20520 2011-04-15 20:10:47Z acheng .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.68 for HDF5 1.9.81.
 #
@@ -662,8 +662,8 @@ TRACE_API
 DEBUG_PKG
 H5_LONE_COLON
 PTHREAD
-BUILD_SZIP_CONDITIONAL_FALSE
-BUILD_SZIP_CONDITIONAL_TRUE
+BUILD_SHARED_SZIP_CONDITIONAL_FALSE
+BUILD_SHARED_SZIP_CONDITIONAL_TRUE
 LL_PATH
 USE_FILTER_SZIP
 USE_FILTER_DEFLATE
@@ -25147,12 +25147,12 @@ $as_echo "no" >&6; }
 
 fi
 
- if test "X$USE_FILTER_SZIP" = "Xyes"; then
-  BUILD_SZIP_CONDITIONAL_TRUE=
-  BUILD_SZIP_CONDITIONAL_FALSE='#'
+ if test "X$USE_FILTER_SZIP" = "Xyes" && test "X$LL_PATH" != "X"; then
+  BUILD_SHARED_SZIP_CONDITIONAL_TRUE=
+  BUILD_SHARED_SZIP_CONDITIONAL_FALSE='#'
 else
-  BUILD_SZIP_CONDITIONAL_TRUE='#'
-  BUILD_SZIP_CONDITIONAL_FALSE=
+  BUILD_SHARED_SZIP_CONDITIONAL_TRUE='#'
+  BUILD_SHARED_SZIP_CONDITIONAL_FALSE=
 fi
 
 
@@ -30030,8 +30030,8 @@ if test -z "${CXX_SHARED_CONDITIONAL_TRUE}" && test -z "${CXX_SHARED_CONDITIONAL
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-if test -z "${BUILD_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SZIP_CONDITIONAL_FALSE}"; then
-  as_fn_error $? "conditional \"BUILD_SZIP_CONDITIONAL\" was never defined.
+if test -z "${BUILD_SHARED_SZIP_CONDITIONAL_TRUE}" && test -z "${BUILD_SHARED_SZIP_CONDITIONAL_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_SHARED_SZIP_CONDITIONAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 if test -z "${DIRECT_VFD_CONDITIONAL_TRUE}" && test -z "${DIRECT_VFD_CONDITIONAL_FALSE}"; then
diff --git a/configure.in b/configure.in
index b42dd59..9d56f4d 100644
--- a/configure.in
+++ b/configure.in
@@ -1818,7 +1818,7 @@ if test "x$HAVE_SZLIB" = "xyes" -a "x$HAVE_SZLIB_H" = "xyes"; then
 
 fi
 
-AM_CONDITIONAL([BUILD_SZIP_CONDITIONAL], [test "X$USE_FILTER_SZIP" = "Xyes"])
+AM_CONDITIONAL([BUILD_SHARED_SZIP_CONDITIONAL], [test "X$USE_FILTER_SZIP" = "Xyes" && test "X$LL_PATH" != "X"])
 
 dnl Checkpoint the cache
 AC_CACHE_SAVE
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8a428ae..9ec6a85 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -97,8 +97,8 @@ 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
-export LD_LIBRARY_PATH=$(LL_PATH)
+if BUILD_SHARED_SZIP_CONDITIONAL
+LD_LIBRARY_PATH=$(LL_PATH)
 endif
 
 include $(top_srcdir)/config/examples.am
diff --git a/examples/Makefile.in b/examples/Makefile.in
index 6c03f02..90e9bff 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -388,6 +388,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.
@@ -657,8 +658,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_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 d1f67bc..ae65a3b 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -91,8 +91,8 @@ ex_table10: $(srcdir)/ex_table10.c
 ex_table11: $(srcdir)/ex_table11.c
 ex_table12: $(srcdir)/ex_table12.c
 
-if BUILD_SZIP_CONDITIONAL
-export LD_LIBRARY_PATH=$(LL_PATH)
+if BUILD_SHARED_SZIP_CONDITIONAL
+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 7a3819a..e4de89e 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -387,6 +387,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.
@@ -651,8 +652,6 @@ ex_table10: $(srcdir)/ex_table10.c
 ex_table11: $(srcdir)/ex_table11.c
 ex_table12: $(srcdir)/ex_table12.c
 
-@BUILD_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH)
-
 # How to create EXAMPLEDIR if it doesn't already exist
 $(EXAMPLEDIR):
 	-$(top_srcdir)/bin/mkdirs $@