From ba0275e3d7d8229257c2d22a1b91554e7d029116 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 25 Apr 2013 13:09:07 -0500
Subject: [svn-r23628] HDFFV-8364: merge from trunk

---
 configure    | 2 +-
 configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index 9918338..5c4bc58 100755
--- a/configure
+++ b/configure
@@ -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"
-- 
cgit v0.12