| Message ID | 1311672640-18000-1-git-send-email-alevy@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 07/26/2011 04:30 AM, Alon Levy wrote: > This is required for building libcacard which doesn't itself require > zlib without bringing in this requirement to the build environment. > > Signed-off-by: Alon Levy<alevy@redhat.com> Applied. Thanks. Regards, Anthony Liguori > --- > I'd like this to go into 0.15.0 too, it makes building libcacard possible > without zlib-devel being installed. > --- > configure | 23 ++++++++++++++--------- > 1 files changed, 14 insertions(+), 9 deletions(-) > > diff --git a/configure b/configure > index 88159ac..5fc0f82 100755 > --- a/configure > +++ b/configure > @@ -178,6 +178,7 @@ rbd="" > smartcard="" > smartcard_nss="" > opengl="" > +zlib="yes" > > # parse CC options first > for opt do > @@ -743,6 +744,8 @@ for opt do > ;; > --enable-smartcard-nss) smartcard_nss="yes" > ;; > + --disable-zlib-test) zlib="no" > + ;; > *) echo "ERROR: unknown option $opt"; show_help="yes" > ;; > esac > @@ -1172,18 +1175,20 @@ fi > ########################################## > # zlib check > > -cat> $TMPC<< EOF > +if test "$zlib" != "no" ; then > + cat> $TMPC<< EOF > #include<zlib.h> > int main(void) { zlibVersion(); return 0; } > EOF > -if compile_prog "" "-lz" ; then > - : > -else > - echo > - echo "Error: zlib check failed" > - echo "Make sure to have the zlib libs and headers installed." > - echo > - exit 1 > + if compile_prog "" "-lz" ; then > + : > + else > + echo > + echo "Error: zlib check failed" > + echo "Make sure to have the zlib libs and headers installed." > + echo > + exit 1 > + fi > fi > > ##########################################
diff --git a/configure b/configure index 88159ac..5fc0f82 100755 --- a/configure +++ b/configure @@ -178,6 +178,7 @@ rbd="" smartcard="" smartcard_nss="" opengl="" +zlib="yes" # parse CC options first for opt do @@ -743,6 +744,8 @@ for opt do ;; --enable-smartcard-nss) smartcard_nss="yes" ;; + --disable-zlib-test) zlib="no" + ;; *) echo "ERROR: unknown option $opt"; show_help="yes" ;; esac @@ -1172,18 +1175,20 @@ fi ########################################## # zlib check -cat > $TMPC << EOF +if test "$zlib" != "no" ; then + cat > $TMPC << EOF #include <zlib.h> int main(void) { zlibVersion(); return 0; } EOF -if compile_prog "" "-lz" ; then - : -else - echo - echo "Error: zlib check failed" - echo "Make sure to have the zlib libs and headers installed." - echo - exit 1 + if compile_prog "" "-lz" ; then + : + else + echo + echo "Error: zlib check failed" + echo "Make sure to have the zlib libs and headers installed." + echo + exit 1 + fi fi ##########################################
This is required for building libcacard which doesn't itself require zlib without bringing in this requirement to the build environment. Signed-off-by: Alon Levy <alevy@redhat.com> --- I'd like this to go into 0.15.0 too, it makes building libcacard possible without zlib-devel being installed. --- configure | 23 ++++++++++++++--------- 1 files changed, 14 insertions(+), 9 deletions(-)