[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.

6 files changed, 16 insertions, 14 deletions

diff --git a/configure b/configure
index 7803fd1..d088ba6 100755
--- a/configure
+++ b/configure
@@ -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
@@ -25177,12 +25177,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
 
 
@@ -28242,6 +28242,7 @@ else
 	  #include <sys/types.h>
 	  #include <sys/stat.h>
 	  #include <fcntl.h>
+	  #include <stdlib.h>
           int main(void)
           {
              int fid;
@@ -30091,8 +30092,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 3f4110e..0fc46a6 100644
--- a/configure.in
+++ b/configure.in
@@ -1851,7 +1851,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
@@ -3032,6 +3032,7 @@ if test "$DIRECT_VFD" = "yes"; then
 	  #include <sys/types.h>
 	  #include <sys/stat.h>
 	  #include <fcntl.h>
+	  #include <stdlib.h>
           int main(void)
           {
              int fid; 
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):
diff --git a/hl/examples/Makefile.am b/hl/examples/Makefile.am
index d1f67bc..fb0045f 100644
--- a/hl/examples/Makefile.am
+++ b/hl/examples/Makefile.am
@@ -91,7 +91,7 @@ ex_table10: $(srcdir)/ex_table10.c
 ex_table11: $(srcdir)/ex_table11.c
 ex_table12: $(srcdir)/ex_table12.c
 
-if BUILD_SZIP_CONDITIONAL
+if BUILD_SHARED_SZIP_CONDITIONAL
 export LD_LIBRARY_PATH=$(LL_PATH)
 endif
 
diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in
index 0d65a6c..5c479ef 100644
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@@ -652,7 +652,7 @@ 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)
+@BUILD_SHARED_SZIP_CONDITIONAL_TRUE@export LD_LIBRARY_PATH=$(LL_PATH)
 
 # How to create EXAMPLEDIR if it doesn't already exist
 $(EXAMPLEDIR):