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

configure script improvements regarding pkg-config support #1526

Closed
wants to merge 5 commits into from

Conversation

Explorer09
Copy link
Contributor

  • Move the macro call of PKG_PROG_PKG_CONFIG.
  • Bring back the warning when configure is generated without pkg.m4
  • CI FreeBSD job now installs pkg-config.

@Explorer09
Copy link
Contributor Author

Minor note: Solaris 11.4 in our CI build jobs supports pkg-config, but the system doesn't seem to come with pkg.m4. So the warning would always exist if you generate htop's configure script there.

@BenBE BenBE added the build system 🔧 Affects the build system rather then the user experience label Aug 22, 2024
@BenBE BenBE added this to the 3.4.0 milestone Aug 22, 2024
Copy link
Member

@BenBE BenBE left a comment

Choose a reason for hiding this comment

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

LGTM.

@Explorer09
Copy link
Contributor Author

I added a change in the README to mention the use of pkg-config. Please review whether the wording is good enough.

pkg-config will be used for detecting 'curses' library in a future
commit. We have been using pkg-config for detecting multiple libraries
('hwloc' and formerly 'libnl'), thus the PKG_PROG_PKG_CONFIG macro
should be called early.

Signed-off-by: Kang-Che Sung <[email protected]>
Commit 24b1513 removed the warning
when the configure script is generated without pkg.m4. I added that
warning years ago (see 103f1a4) to
prevent downstream distributions from creating a tarball with an
"incomplete" configure script. Add the warning back, reword the
messages to tell exactly what feature would be missing (to builders),
and also add FORCE_MAKE_DIST variable for builders who want to ignore
the warning. :)

Signed-off-by: Kang-Che Sung <[email protected]>
This allows configure to be generated with pkg.m4 in FreeBSD build job.
@BenBE
Copy link
Member

BenBE commented Sep 20, 2024

Merged as part of #1512

@BenBE BenBE closed this Sep 20, 2024
@Explorer09 Explorer09 deleted the pkg-config-init branch September 20, 2024 21:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build system 🔧 Affects the build system rather then the user experience
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants