emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure: avoid using zlib's pkgconfig file, fixes issue 6.

Browse Source 
Not all systems provide a zlib.pc file, so explicitly check for
InflateInit2() which is what we use in XBPS.

Thanks to str1ngs for finding this error on Ubuntu.
This commit is contained in:
Juan RP 2011-07-04 13:09:37 +02:00
parent 979c585652
commit c8ee562d7c
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
configure vendored
View File

@ -374,6 +374,39 @@ else
echo "CPPFLAGS += -DHAVE_STRLCAT" >>$CONFIG_MK echo "CPPFLAGS += -DHAVE_STRLCAT" >>$CONFIG_MK
fi fi
#
# zlib is required.
#
func=InflateInit2
printf "Checking for zlib $func() ... "
cat <<EOF > _$func.c
#include <zlib.h>
int main(void) {
z_stream strm;
strm.zalloc = Z_NULL;
strm.zfree = Z_NULL;
strm.opaque = Z_NULL;
strm.avail_in = 0;
strm.next_in = Z_NULL;
inflateInit2(&strm, 15+16);
return 0;
}
EOF
if $XCC -lz _$func.c -o _$func 2>/dev/null; then
ZLIB=yes
else
ZLIB=no
fi
echo "$ZLIB."
rm -f _$func.c _$func
if [ "$ZLIB" = "no" ]; then
echo "Failed to link with your system's zlib, can't continue..."
exit 1
else
echo "LDFLAGS += -lz" >>$CONFIG_MK
echo "STATIC_LIBS += -lz" >>$CONFIG_MK
fi
# #
# If building API library documentation, doxygen and graphviz are required. # If building API library documentation, doxygen and graphviz are required.
# #
@ -430,21 +463,6 @@ else
echo "STATIC_LIBS = \$(TOPDIR)/lib/libxbps.a -lfetch" >>$CONFIG_MK echo "STATIC_LIBS = \$(TOPDIR)/lib/libxbps.a -lfetch" >>$CONFIG_MK
fi fi
#
# zlib with pkg-config support is required.
#
printf "Checking for zlib via pkg-config ... "
if ! $PKGCONFIG_BIN --exists zlib; then
echo "zlib.pc file not found, exiting."
exit 1
else
echo "found version $($PKGCONFIG_BIN --modversion zlib)."
echo "CFLAGS += $($PKGCONFIG_BIN --cflags zlib)" >>$CONFIG_MK
echo "LDFLAGS += $($PKGCONFIG_BIN --libs zlib)" >>$CONFIG_MK
echo "STATIC_LIBS += $($PKGCONFIG_BIN --libs --static zlib)" \
>>$CONFIG_MK
fi
# #
# Check if external proplib via pkg-config should be used instead. # Check if external proplib via pkg-config should be used instead.
# #