autogen.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
New commits: commit 7d808563a3315a21039130210ad0e8f567777fe6 Author: Christian Lohmaier <[email protected]> AuthorDate: Fri Nov 29 19:11:28 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Wed Dec 4 11:17:26 2024 +0100 don't require pkg-config in wsl-as-helper build windows build doesn't make use of system libraries, so we only need to make autoconf/configure happy (allow it to use PKG_CHECK_MODULES macro) but for that adding the m4/mac path is enough (there's nothing mac specific, just the pkg-config macros have been added for mac initially) Change-Id: Ia5db12833c26d89b7e0dbd7009562836885d8055 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177562 Reviewed-by: Ilmari Lauhakangas <[email protected]> Tested-by: Jenkins Reviewed-by: Christian Lohmaier <[email protected]> (cherry picked from commit 2d5f8af346dfbd6b534a6dade13a92512014db00) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177726 Reviewed-by: Michael Stahl <[email protected]> diff --git a/autogen.sh b/autogen.sh index b961dd1934b3..e56d2ecd1462 100755 --- a/autogen.sh +++ b/autogen.sh @@ -45,7 +45,10 @@ sub sanity_checks($) $autoconf => "autoconf is required", $aclocal => "$aclocal is required", ); - + if ($ENV{WSL_DISTRO_NAME} && $ENV{PATH} =~ /mingw64/) { + # for wsl-as-helper build we only need the m4 macros like for macOS + delete $required{'pkg-config'}; + } for my $elem (@path) { for my $app (keys %required) { if (-f "$elem/$app") { @@ -160,7 +163,8 @@ if (defined $ENV{LODE_HOME}) my $aclocal_flags = $ENV{ACLOCAL_FLAGS}; $aclocal_flags .= " -I $src_path/m4"; -$aclocal_flags .= " -I $src_path/m4/mac" if ($system eq 'Darwin'); +# the m4/mac directory provides the pkg-config macros used in configure +$aclocal_flags .= " -I $src_path/m4/mac" if ($system eq 'Darwin' || ($ENV{WSL_DISTRO_NAME} && $ENV{PATH} =~ /mingw64/)); $ENV{AUTOMAKE_EXTRA_FLAGS} = '--warnings=no-portability' if (!($system eq 'Darwin'));
