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

Adding pkg-config for ncurses and slang. #8

Merged
merged 1 commit into from Apr 24, 2020

Conversation

kwhat
Copy link
Contributor

@kwhat kwhat commented Apr 22, 2020

HI,

I was having some trouble building on Gentoo due to ncurses using tinfo. (457530) The solution is just to add pkg-config for ncurses and I went ahead and added it for slang as well. This looks like a similar fix to what was done for freetype support. The only part that seems a little sketchy is Makefile.usr. Please let me know if there is anything I should address.

Thanks.

Copy link
Contributor

@chewi chewi left a comment

Choose a reason for hiding this comment

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

I haven't tested it yet but I think just the one change is needed.

The way that the PKG_CHECK_MODULES calls are repeated and the link test is only performed in the "auto" case seems odd to me. It could probably be turned inside-out with most of the code in the PKG_CHECK_MODULES "found" clause. It is consistent with the rest though so fair enough. 😃

configure.ac Outdated Show resolved Hide resolved
@kwhat
Copy link
Contributor Author

kwhat commented Apr 23, 2020

The way that the PKG_CHECK_MODULES calls are repeated and the link test is only performed in the "auto" case seems odd to me. It could probably be turned inside-out with most of the code in the PKG_CHECK_MODULES "found" clause. It is consistent with the rest though so fair enough.

Thanks for taking a look! I agree, but I didn't want to change more than was required for fix and since it was like that a for the other modules I just cookie cuttered it out. I removed the leftover PKG_CHECK_MODULES and updated the Gentoo PR patch as well.

@@ -302,6 +302,8 @@ SDLCFLAGS = $(shell sdl-config --cflags)
SDLLIBS = $(shell sdl-config --libs)
FREETYPECFLAGS = $(shell freetype-config --cflags)
FREETYPELIBS = $(shell freetype-config --libs)
NCURSESCFLAGS = $(shell ncurses6-config --cflags)
NCURSESLIBS = $(shell ncurses6-config --libs)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@chewi I am not sure what this file is for, but it seems like it should have some SLANGCFLAGS and SLANGLIBS definitions somewhere? I also didn't make an attempt to add anything for Windows, Dos or any other targets outside of Linux as I am not sure what the impact maybe. Just let me know if any adjustments are need.

Copy link
Contributor

Choose a reason for hiding this comment

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

I think this is only used for DOS and Windows. It's merged now so hey ho.

@amadvance amadvance merged commit 4ede82d into amadvance:master Apr 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants