bzip2 support on solaris

[Matt Selsky]

I'm trying to build gnupg-1.2.4 on Solaris 9 with bzip2 support.  I 
configured like this:

$ ./configure --prefix=/opt/gnupg-1.2.4

config.log includes this:

configure:15810: checking bzlib.h usability
configure:15823: gcc -c -g -O2  conftest.c >&5
configure:15826: $? = 0
configure:15829: test -s conftest.o
configure:15832: $? = 0
configure:15842: result: yes
configure:15846: checking bzlib.h presence
configure:15857: gcc -E  conftest.c
configure:15863: $? = 0
configure:15882: result: yes
configure:15918: checking for bzlib.h
configure:15925: result: yes
configure:15930: checking for BZ2_bzCompressInit in -lbz2
configure:15961: gcc -o conftest -g -O2   conftest.c -lbz2   >&5
configure:15964: $? = 0
configure:15967: test -s conftest
configure:15970: $? = 0
configure:15982: result: yes

However, when I go to build gpg:

Making all in g10
make[2]: Entering directory `/src/security/gnupg-1.2.4/obj/solaris9/g10'
source='compress-bz2.c' object='compress-bz2.o' libtool=no \
depfile='.deps/compress-bz2.Po' tmpdepfile='.deps/compress-bz2.TPo' \
depmode=gcc /bin/bash ../scripts/depcomp \
gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../include -I../intl   -DGNUPG_LIBEXECDIR="\"/opt/gnupg-1.2.4/libexec/gnupg\"" -g -O2 -Wall -c `test -f 'compress-bz2.c' || echo './'`compress-bz2.c
In file included from compress-bz2.c:23:
/usr/include/bzlib.h:177: parse error before `FILE'
/usr/include/bzlib.h:205: parse error before `FILE'
make[2]: *** [compress-bz2.o] Error 1
make[2]: Leaving directory `/src/security/gnupg-1.2.4/obj/solaris9/g10'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/src/security/gnupg-1.2.4/obj/solaris9'
make: *** [all] Error 2


This patch seems to fix the problem on Solaris.  I'm not sure it's the
best fix though.

diff -ur gnupg-1.2.4.orig/g10/compress-bz2.c gnupg-1.2.4/src/g10/compress-bz2.c
--- gnupg-1.2.4.orig/g10/compress-bz2.c Sat Nov 15 18:49:44 2003
+++ gnupg-1.2.4/src/g10/compress-bz2.c    Wed Dec 24 
20:36:27 2003
@@ -20,6 +20,7 @@
 
 #include <config.h>
 #include <string.h>
+#include <stdio.h>
 #include <bzlib.h>
 
 #include "util.h"


Cheers.