Fix pcregrep build problem when bzip2 but not gzip was enabled.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@971 2f5784b3-3f2a-0410-8824-cb99058d5e15

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 5a36a1f..fca8fc0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,10 @@ Version 8.31
 
 33. Variable renamings in the PCRE-JIT compiler. No functionality change.
 
+34. Fixed typos in pcregrep: in two places there was SUPPORT_LIBZ2 instead of 
+    SUPPORT_LIBBZ2. This caused a build problem when bzip2 but not gzip (zlib)
+    was enabled.
+
 
 Version 8.30 04-February-2012
 -----------------------------
diff --git a/pcregrep.c b/pcregrep.c
index be07f61..65221ee 100644
--- a/pcregrep.c
+++ b/pcregrep.c
@@ -1618,7 +1618,7 @@ gzFile ingz = NULL;
 BZFILE *inbz2 = NULL;
 #endif
 
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
 int pathlen;
 #endif
 
@@ -1701,7 +1701,7 @@ skipping was not requested. The scan proceeds. If this is the first and only
 argument at top level, we don't show the file name, unless we are only showing
 the file name, or the filename was forced (-H). */
 
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
 pathlen = (int)(strlen(pathname));
 #endif