Merge pull request #11 from stickz/build-fix

libtorrent: Use pkg-check to find zlib
stickz · Apr 13, 2024 · dc8be03 · dc8be03
2 parents 971d142 + e853b77
commit dc8be03
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 146 deletions.
diff --git a/libtorrent/configure.ac b/libtorrent/configure.ac
@@ -59,13 +59,13 @@ TORRENT_WITH_INOTIFY
 CC_ATTRIBUTE_VISIBILITY
 
 AX_PTHREAD
-AX_CHECK_ZLIB
 
+PKG_CHECK_MODULES([ZLIB], [zlib])
 PKG_CHECK_MODULES([CPPUNIT], [cppunit],, [no_cppunit="yes"])
 
-CFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
-CXXFLAGS="$PTHREAD_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
-LIBS="$PTHREAD_LIBS $CPPUNIT_LIBS $LIBS"
+CFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CPPUNIT_CFLAGS $CFLAGS"
+CXXFLAGS="$PTHREAD_CFLAGS $ZLIB_CFLAGS $CPPUNIT_CFLAGS $CXXFLAGS"
+LIBS="$PTHREAD_LIBS $ZLIB_CFLAGS $CPPUNIT_LIBS $LIBS"
 
 AC_ARG_ENABLE(openssl,
   [  --disable-openssl       Don't use OpenSSL's SHA1 implementation.],

diff --git a/libtorrent/scripts/ax_check_zlib.m4 b/libtorrent/scripts/ax_check_zlib.m4