diff options
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | perform/Makefile.in | 4 | ||||
| -rw-r--r-- | test/Makefile.in | 25 |
4 files changed, 22 insertions, 21 deletions
@@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 17589 2009-10-04 12:56:18Z lrknox . +# From configure.in Id: configure.in 17616 2009-10-08 15:17:30Z mamcgree . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.64 for HDF5 1.9.48. # @@ -23291,7 +23291,7 @@ else fi - if test -n "$HAVE_DMALLOC"; then + if test -n "$HAVE_DMALLOC" -a -n "$dmalloc_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib" fi @@ -23507,7 +23507,7 @@ if test "x$ac_cv_func_compress2" = x""yes; then : fi - if test -n "$HAVE_ZLIB"; then + if test -n "$HAVE_ZLIB" -a -n "$zlib_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib" fi @@ -23726,7 +23726,7 @@ else fi - if test -n "$HAVE_SZLIB"; then + if test -n "$HAVE_SZLIB" -a -n "$szlib_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib" fi diff --git a/configure.in b/configure.in index 54c22ee..ecce97a 100644 --- a/configure.in +++ b/configure.in @@ -1499,7 +1499,7 @@ case $withval in AC_CHECK_LIB(dmalloc, dmalloc_shutdown,, LDFLAGS="$saved_LDFLAGS"; unset HAVE_DMALLOC) - if test -n "$HAVE_DMALLOC"; then + if test -n "$HAVE_DMALLOC" -a -n "$dmalloc_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$dmalloc_lib" fi @@ -1581,7 +1581,7 @@ case $withval in [LDFLAGS="$saved_LDFLAGS"; unset HAVE_ZLIB]) AC_CHECK_FUNC([compress2], [HAVE_COMPRESS2="yes"]) - if test -n "$HAVE_ZLIB"; then + if test -n "$HAVE_ZLIB" -a -n "$zlib_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$zlib_lib" fi @@ -1673,7 +1673,7 @@ case $withval in AC_CHECK_LIB([sz], [SZ_BufftoBuffCompress],, [LDFLAGS="$saved_LDFLAGS"; unset HAVE_SZLIB]) - if test -n "$HAVE_SZLIB"; then + if test -n "$HAVE_SZLIB" -a -n "$szlib_lib"; then AM_LDFLAGS="$AM_LDFLAGS -L$szlib_lib" fi diff --git a/perform/Makefile.in b/perform/Makefile.in index ff5fa34..da941e3 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -405,8 +405,8 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf perf # Add h5perf and h5perf_serial specific linker flags here -h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(LD_FLAGS) -h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC) $(LD_FLAGS) +h5perf_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) +h5perf_serial_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) # Some programs are not built or run by default, but can be built by hand or by # specifying --enable-build-all at configure time. diff --git a/test/Makefile.in b/test/Makefile.in index 3f063e9..0f8adca 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -247,7 +247,7 @@ gen_nullspace_SOURCES = gen_nullspace.c gen_nullspace_OBJECTS = gen_nullspace.$(OBJEXT) gen_nullspace_LDADD = $(LDADD) gen_nullspace_DEPENDENCIES = libh5test.la $(LIBHDF5) -gen_specmetaread = gen_specmetaread.c +gen_specmetaread_SOURCES = gen_specmetaread.c gen_specmetaread_OBJECTS = gen_specmetaread.$(OBJEXT) gen_specmetaread_LDADD = $(LDADD) gen_specmetaread_DEPENDENCIES = libh5test.la $(LIBHDF5) @@ -377,12 +377,12 @@ SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c btree2.c \ flush1.c flush2.c freespace.c gen_bad_ohdr.c gen_bogus.c \ gen_cross.c gen_deflate.c gen_filespace.c gen_filters.c \ gen_new_array.c gen_new_fill.c gen_new_group.c gen_new_mtime.c \ - gen_new_super.c gen_noencoder.c gen_nullspace.c gen_udlinks.c \ - getname.c gheap.c hyperslab.c istore.c lheap.c links.c mf.c \ - mount.c mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c \ - set_extent.c space_overflow.c stab.c tcheck_version.c \ - $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \ - vfd.c gen_specmetaread.c + gen_new_super.c gen_noencoder.c gen_nullspace.c \ + gen_specmetaread.c gen_udlinks.c getname.c gheap.c hyperslab.c \ + istore.c lheap.c links.c mf.c mount.c mtime.c ntypes.c \ + objcopy.c ohdr.c pool.c reserved.c set_extent.c \ + space_overflow.c stab.c tcheck_version.c $(testhdf5_SOURCES) \ + testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c DIST_SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c \ btree2.c cache.c cache_api.c cmpd_dset.c cross_read.c dangle.c \ dsets.c dt_arith.c dtransform.c dtypes.c earray.c enum.c \ @@ -391,11 +391,12 @@ DIST_SOURCES = $(libh5test_la_SOURCES) app_ref.c big.c bittests.c \ gen_bogus.c gen_cross.c gen_deflate.c gen_filespace.c \ gen_filters.c gen_new_array.c gen_new_fill.c gen_new_group.c \ gen_new_mtime.c gen_new_super.c gen_noencoder.c \ - gen_nullspace.c gen_udlinks.c getname.c gheap.c hyperslab.c \ - istore.c lheap.c links.c mf.c mount.c mtime.c ntypes.c \ - objcopy.c ohdr.c pool.c reserved.c set_extent.c \ - space_overflow.c stab.c tcheck_version.c $(testhdf5_SOURCES) \ - testmeta.c $(ttsafe_SOURCES) unlink.c vfd.c gen_specmetaread.c + gen_nullspace.c gen_specmetaread.c gen_udlinks.c getname.c \ + gheap.c hyperslab.c istore.c lheap.c links.c mf.c mount.c \ + mtime.c ntypes.c objcopy.c ohdr.c pool.c reserved.c \ + set_extent.c space_overflow.c stab.c tcheck_version.c \ + $(testhdf5_SOURCES) testmeta.c $(ttsafe_SOURCES) unlink.c \ + vfd.c ETAGS = etags CTAGS = ctags am__tty_colors = \ |