diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-04-25 18:09:07 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-04-25 18:09:07 (GMT) |
| commit | ba0275e3d7d8229257c2d22a1b91554e7d029116 (patch) | |
| tree | 69fd69b419274c496c7dbf626089b50c0af0c0ae | |
| parent | ce593b0f5674cb29360ef4fccf42f7d1ebe3ea68 (diff) | |
| download | hdf5-ba0275e3d7d8229257c2d22a1b91554e7d029116.zip hdf5-ba0275e3d7d8229257c2d22a1b91554e7d029116.tar.gz hdf5-ba0275e3d7d8229257c2d22a1b91554e7d029116.tar.bz2 | |
[svn-r23628] HDFFV-8364: merge from trunk
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -25964,7 +25964,7 @@ if test "x$ac_cv_header_szlib_h" = xyes; then : _ACEOF HAVE_SZLIB_H="yes" else - CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_SZIP + CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS" unset HAVE_SZLIB fi done diff --git a/configure.ac b/configure.ac index 2ff93a2..915fad3 100644 --- a/configure.ac +++ b/configure.ac @@ -1883,7 +1883,7 @@ case $withval in AC_CHECK_HEADERS([szlib.h], [HAVE_SZLIB_H="yes"], - [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZIP]) + [CPPFLAGS="$saved_CPPFLAGS"; AM_CPPFLAGS="$saved_AM_CPPFLAGS"] [unset HAVE_SZLIB]) if test -n "$szlib_lib"; then LDFLAGS="$LDFLAGS -L$szlib_lib" |