diff options
author | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-09 20:12:06 (GMT) |
---|---|---|
committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2009-10-09 20:12:06 (GMT) |
commit | 7f0eb8e04e6de4bde7123701cedf7fd769d6196a (patch) | |
tree | 3a1bf31fe8871af8f8c306db8719b18e47225850 /configure | |
parent | 492da787dd6f21a159c3dfbd74ecf44653177cee (diff) | |
download | hdf5-7f0eb8e04e6de4bde7123701cedf7fd769d6196a.zip hdf5-7f0eb8e04e6de4bde7123701cedf7fd769d6196a.tar.gz hdf5-7f0eb8e04e6de4bde7123701cedf7fd769d6196a.tar.bz2 |
[svn-r17627] Purpose:
Couple quick configure cleanups
Description:
- Made a few AM_LDFLAGS assignments a bit safer.
- Regenerated a couple Makefile.in's via bin/reconfigure to address
some typo-fixes that didn't propagate in my last check-in.
Tested:
- h5committest
- Also, I suspect this fix will address a failure on Sandia's clogin2
machine, but Albert currently has no password to gain access, so I have
only minimal logs of the failure and no way to test it there. I'll
just let the automated tests there determine if indeed I'm right.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 8 |
1 files changed, 4 insertions, 4 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 |