Skip to content

Commit

Permalink
meson: Favor openldap when building on macOS
Browse files Browse the repository at this point in the history
  • Loading branch information
rdmark committed Nov 27, 2024
1 parent e839b63 commit ca8b6b9
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,7 @@ jobs:
- uses: actions/checkout@v4
- name: Install dependencies
run: |
brew install berkeley-db cmark-gfm dbus docbook-xsl libxslt meson mysql talloc
brew install berkeley-db cmark-gfm dbus docbook-xsl libxslt meson mysql openldap talloc
- name: Configure
run: |
meson setup build \
Expand Down
4 changes: 4 additions & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,10 @@ ldap_path = get_option('with-ldap-path')

ldap_link_args = []

if ldap_path == '' and host_os == 'darwin' and fs.exists(macos_prefix / 'opt/openldap')
ldap_path = macos_prefix / 'opt/openldap'
endif

if ldap_path != ''
ldap_link_args += ['-L' + ldap_path / 'lib', '-lldap']
ldap = declare_dependency(
Expand Down

0 comments on commit ca8b6b9

Please sign in to comment.