got it to compile standalone

diff --git a/Makefile.PL b/Makefile.PL
index 04b0b45..9e2a14e 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -11,7 +11,10 @@ clean:: extra_clean
 install:: extra_install
 pure_install:: extra_install
 
-extra_build: zgz/zgz pristine-tar.spec
+ZOMBIES=zgz/pit/suse-bzip2/suse-bzip2
+BINS=zgz/zgz $(ZOMBIES)
+
+extra_build: $(BINS) pristine-tar.spec
        pod2man -c pristine-tar pristine-tar > pristine-tar.1
        pod2man -c pristine-gz  pristine-gz  > pristine-gz.1
        pod2man -c pristine-bz2 pristine-bz2 > pristine-bz2.1
@@ -21,14 +24,20 @@ ZGZ_SOURCES = zgz/zgz.c zgz/gzip/*.c zgz/old-bzip2/*.c
 zgz/zgz: $(ZGZ_SOURCES)
        gcc -Wall -O2 -o $@ $(ZGZ_SOURCES) -lz
 
+SUSE_BZIP2_SOURCES = zgz/pit/suse-bzip2/*.c
+zgz/pit/suse-bzip2/suse-bzip2: $(SUSE_BZIP2_SOURCES)
+       gcc -Wall -O2 -o $@ $(SUSE_BZIP2_SOURCES)
+
 extra_install:
        install -d $(DESTDIR)/usr/bin
        install -d $(DESTDIR)/usr/share/man/man1
        install pristine-tar pristine-gz pristine-bz2 zgz/zgz $(DESTDIR)/usr/bin
        install -m 0644 *.1 $(DESTDIR)/usr/share/man/man1
+       install -d $(DESTDIR)/usr/lib/zgz
+       install $(ZOMBIES) $(DESTDIR)/usr/lib/zgz
 
 extra_clean: pristine-tar.spec
-       rm -f zgz/zgz *.1
+       rm -f *.1 $(BINS)
 
 pristine-tar.spec:
        sed -i "s/Version:.*/Version: $$(perl -e '$$_=<>;print m/\((.*?)\)/'<debian/changelog)/" pristine-tar.spec

diff --git a/zgz/pit/suse-bzip2/bzlib.c b/zgz/pit/suse-bzip2/bzlib.c
index d5613d9..ace791a 100644 (file)
--- a/zgz/pit/suse-bzip2/bzlib.c
+++ b/zgz/pit/suse-bzip2/bzlib.c
@@ -46,6 +46,9 @@ void panic (char *msg) {
 }
 
 static
+Bool myfeof ( FILE* f );
+
+static
 void compressStream ( FILE *stream, FILE *zStream )
 {
    BZFILE* bzf = NULL;
@@ -57,7 +60,7 @@ void compressStream ( FILE *stream, FILE *zStream )
    if (ferror(stream)) goto errhandler_io;
    if (ferror(zStream)) goto errhandler_io;
 
-   bzf = bzWriteOpen ( &bzerr, zStream, 
+   bzf = BZ2_bzWriteOpen ( &bzerr, zStream, 
                        blockSize100k, verbosity, workFactor );   
    if (bzerr != BZ_OK) goto errhandler;
 
@@ -68,12 +71,12 @@ void compressStream ( FILE *stream, FILE *zStream )
       if (myfeof(stream)) break;
       nIbuf = fread ( ibuf, sizeof(UChar), 5000, stream );
       if (ferror(stream)) goto errhandler_io;
-      if (nIbuf > 0) bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
+      if (nIbuf > 0) BZ2_bzWrite ( &bzerr, bzf, (void*)ibuf, nIbuf );
       if (bzerr != BZ_OK) goto errhandler;
 
    }
 
-   bzWriteClose ( &bzerr, bzf, 0, &nbytes_in, &nbytes_out );
+   BZ2_bzWriteClose ( &bzerr, bzf, 0, &nbytes_in, &nbytes_out );
    if (bzerr != BZ_OK) goto errhandler;
 
    if (ferror(zStream)) goto errhandler_io;
@@ -92,7 +95,7 @@ void compressStream ( FILE *stream, FILE *zStream )
    return;
 
    errhandler:
-   bzWriteClose ( &bzerr_dummy, bzf, 1, &nbytes_in, &nbytes_out );
+   BZ2_bzWriteClose ( &bzerr_dummy, bzf, 1, &nbytes_in, &nbytes_out );
    switch (bzerr) {
       case BZ_MEM_ERROR:
          panic ( "out of memory" );
@@ -898,7 +901,6 @@ BZFILE * bzopen_or_bzdopen
                  int open_mode)      /* bzopen: 0, bzdopen:1 */
 {
    int    bzerr;
-   char   unused[BZ_MAX_UNUSED];
    int    blockSize100k = 9;
    int    writing       = 0;
    char   mode2[10]     = "";
@@ -906,8 +908,6 @@ BZFILE * bzopen_or_bzdopen
    BZFILE *bzfp         = NULL;
    int    verbosity     = 0;
    int    workFactor    = 30;
-   int    smallMode     = 0;
-   int    nUnused       = 0; 
 
    if (mode == NULL) return NULL;
    while (*mode) {
@@ -917,7 +917,7 @@ BZFILE * bzopen_or_bzdopen
       case 'w':
          writing = 1; break;
       case 's':
-         smallMode = 1; break;
+         /*smallMode = 1;*/ break;
       default:
          if (isdigit((int)(*mode))) {
             blockSize100k = *mode-BZ_HDR_0;

diff --git a/zgz/pit/suse-bzip2/bzlib_private.h b/zgz/pit/suse-bzip2/bzlib_private.h
index 4324859..b35be39 100644 (file)
--- a/zgz/pit/suse-bzip2/bzlib_private.h
+++ b/zgz/pit/suse-bzip2/bzlib_private.h
@@ -152,7 +152,7 @@ extern Int32 rNums[512];
 
 /*-- Stuff for doing CRCs. --*/
 
-extern UInt32 crc32Table[256];
+UInt32 crc32Table[256];
 
 #define BZ_INITIALISE_CRC(crcVar)              \
 {                                              \