mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-06 06:29:01 +08:00
0707a17ecf
* Restore upstream's DLL name * Don't add debug postfix * Decouple wrapper from config * Don't inject Find module stuff into config * Cleanup * [skip actions] Trim lzmad and LibLZMA patching * [skip actions] Fix CMAKE_DISABLE_FIND_PACKAGE_LibLZMA * [skip actions] CI * Update manifests * Update versions * Backfill LibLZMA::LibLZMA to CMake < 3.14 * Update versions * Update versions
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
diff --git a/configure b/configure
|
|
index bd2de34..fba948a 100755
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -3993,6 +3993,9 @@ for opt do
|
|
--libfuzzer=*)
|
|
libfuzzer_path="$optval"
|
|
;;
|
|
+ --debug)
|
|
+ enable debug_configure
|
|
+ ;;
|
|
*)
|
|
optname="${opt%%=*}"
|
|
optname="${optname#--}"
|
|
@@ -6152,7 +6153,11 @@
|
|
|
|
enabled zlib && { check_pkg_config zlib zlib "zlib.h" zlibVersion ||
|
|
check_lib zlib zlib.h zlibVersion -lz; }
|
|
-enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
|
|
+if enabled debug_configure; then
|
|
+ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2d
|
|
+else
|
|
+ enabled bzlib && check_lib bzlib bzlib.h BZ2_bzlibVersion -lbz2
|
|
+fi
|
|
enabled lzma && check_lib lzma lzma.h lzma_version_number -llzma
|
|
|
|
# On some systems dynamic loading requires no extra linker flags
|
|
@@ -6350,7 +6350,11 @@ enabled librubberband && require_pkg_config librubberband "rubberband >= 1.8
|
|
enabled libshine && require_pkg_config libshine shine shine/layer3.h shine_encode_buffer
|
|
enabled libsmbclient && { check_pkg_config libsmbclient smbclient libsmbclient.h smbc_init ||
|
|
require libsmbclient libsmbclient.h smbc_init -lsmbclient; }
|
|
-enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
|
|
+if enabled debug_configure; then
|
|
+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappyd -lstdc++
|
|
+else
|
|
+ enabled libsnappy && require libsnappy snappy-c.h snappy_compress -lsnappy -lstdc++
|
|
+fi
|
|
enabled libsoxr && require libsoxr soxr.h soxr_create -lsoxr
|
|
enabled libssh && require_pkg_config libssh libssh libssh/sftp.h sftp_init
|
|
enabled libspeex && require_pkg_config libspeex speex speex/speex.h speex_decoder_init
|