dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

configure: fix testing for bzip2 on windows

This commit is contained in:
Michael Henning 2014-08-19 00:03:09 -04:00
parent 23245d2788
commit 4b9bd6ba7d
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.ac
View File

@ -1274,14 +1274,25 @@ AC_SUBST(Z_LIBS)
# Check for libbzip2
####################
gimp_save_LIBS=$LIBS
LIBS="$LIBS -lbz2"
if test -z "$BZIP2_LIBS"; then
AC_CHECK_LIB(bz2, BZ2_bzCompress,
[AC_CHECK_HEADER(bzlib.h,
BZIP2_LIBS='-lbz2',
AC_MSG_ERROR([libbzip2 header files not found]))],
AC_MSG_ERROR([libbzip2 library not found]))
# We used to use AC_CHECK_LIB, but bz2 uses the WINAPI calling convention on
# windows, so the test needs to #include <bzlib.h> to be able to link properly
AC_CHECK_HEADER(bzlib.h,
[AC_MSG_CHECKING([for BZ2_bzCompress in -lbz2]);
AC_LINK_IFELSE(
[AC_LANG_PROGRAM(
[#include <bzlib.h>],
[BZ2_bzCompress (NULL, 0);])],
[AC_MSG_RESULT([yes]); BZIP2_LIBS='-lbz2'],
AC_MSG_ERROR([libbzip2 library not found]))],
AC_MSG_ERROR([libbzip2 header files not found]))
fi
LIBS=$gimp_save_LIBS
AC_SUBST(BZIP2_LIBS)