Skip to content

Commit d902d65

Browse files
committed
fix static module includes when using pkg-config
1 parent f8d79ac commit d902d65

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

build/f_wget_build.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,13 @@ BLD_CONFIG_BUILD_MSVC_RUNTIME_INFO_ADD_TO_C_AND_LDFLAGS=1
1414

1515
function ourmain() {
1616
startcommon;
17-
# if [[ $BLD_CONFIG_PREFER_STATIC_LINKING -eq 1 ]]; then
18-
# BLD_CONFIG_CONFIG_CMD_ADDL+=("--enable-static")
19-
# fi
2017

2118
if [[ $BLD_CONFIG_BUILD_DEBUG -eq 1 ]]; then #if switching back they should just regen configure
2219
BLD_CONFIG_CONFIG_CMD_ADDL+=("--enable-assert")
2320
export CFLAGS="-DENABLE_DEBUG $CFLAGS"
2421
fi
2522
add_lib_pkg_config "libpsl" "pcre2" "zlib" "openssl"
2623
#add_vcpkg_pkg_config "openssl"
27-
add_vcpkg_pkg_config "brotli" "zstd"
2824

2925
if test 5 -gt 100; then
3026
echo "Just move the fi down as you want to skip steps, or pass the step to skip to (per below) as the first arg"
@@ -37,6 +33,10 @@ fi
3733

3834
if [[ -z $SKIP_STEP || $SKIP_STEP == "our_patch" ]]; then
3935
apply_our_repo_patch; #looks in the patches folder for repo_BUILD_NAME.patch and if found applies it. Easy way to generate the patch from modified repo, go to your modified branch (make sure code committed) and run: git diff --color=never master > repo_NAME.patch
36+
if [[ $BLD_CONFIG_PREFER_STATIC_LINKING -eq 1 ]]; then
37+
sed -i -E "s#PKG_CHECK_MODULES_STATIC#PKG_CHECK_MODULES#g;s#PKG_CHECK_MODULES#PKG_CHECK_MODULES_STATIC#g" configure.ac
38+
fi
39+
4040
SKIP_STEP=""
4141
fi
4242

0 commit comments

Comments
 (0)