Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add time-admin dependency check on systemd #748

Merged
merged 1 commit into from
Apr 1, 2024
Merged

Conversation

zhuyaliang
Copy link
Member

time-admin depends on systemd. If systemd is not used in the systemd, time-admin is disabled

@zhuyaliang
Copy link
Member Author

@cwendling I am not very familiar with autoconf, can I modify it this way?

@lukefromdc
Copy link
Member

Looks to me like we are setting a variable, then setting it to a non-null value only if systemd is detected. I also don't know the build systems that well but this should have the same effect when systemd is not present as the
= \
lines as that's what it should expand to in those cases

We also support meson for mate-control-center, though only one actually HAS to work for non-systemd distros to build m-c-c today, the point to any meson work is an eventual transition to it. That is important especially if autotools ever goes unmaintained.

@zhuyaliang
Copy link
Member Author

zhuyaliang commented Mar 27, 2024

After this PR is accepted, I will add meson support for checking systemd

Copy link
Member

@cwendling cwendling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Almost OK :)
You can also verify it does the right thing if make dist creates a tarball with the time-admin capplet sources when run from a build tree configured with systemd disabled.

capplets/Makefile.am Outdated Show resolved Hide resolved
capplets/Makefile.am Outdated Show resolved Hide resolved
time-admin depends on systemd. If systemd is not used in the systemd, time-admin is disabled
Copy link
Member

@cwendling cwendling left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@zhuyaliang
Copy link
Member Author

Fix #744

@zhuyaliang zhuyaliang merged commit 9c2e887 into master Apr 1, 2024
3 checks passed
@zhuyaliang zhuyaliang deleted the time-admin branch April 1, 2024 01:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants