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

Try searching for libsodium with pkg-config in ./configure. #38

Merged
merged 1 commit into from
Aug 17, 2016

Conversation

iphydf
Copy link
Member

@iphydf iphydf commented Aug 17, 2016

If libsodium can't be found with AC_CHECK_LIB, try PKG_CHECK_MODULES. If that
also fails, abort configure.


This change is Reviewable

@iphydf iphydf force-pushed the libsodium-pkgconfig branch 2 times, most recently from beca154 to 448142b Compare August 17, 2016 17:29
@nurupo
Copy link
Member

nurupo commented Aug 17, 2016

configure.ac, line 379 [r1] (raw file):

    AC_SUBST(NACL_OBJECTS)
    AC_SUBST(NACL_OBJECTS_PKGCONFIG)
elif test "x$LIBSODIUM_FOUND" = "xno"; then

Not sure why you changed it to a specific condition


Comments from Reviewable

@iphydf
Copy link
Member Author

iphydf commented Aug 17, 2016

Review status: 0 of 2 files reviewed at latest revision, 1 unresolved discussion, some commit checks failed.


configure.ac, line 379 [r1] (raw file):

Previously, nurupo wrote…

Not sure why you changed it to a specific condition

Because if libsodium was found with `pkg-config`, we no longer need to search for it manually, but if someone explicitly passes `--with-libsodium-libs`, then we want to use that instead of the found one.

Comments from Reviewable

If libsodium can't be found with PKG_CHECK_MODULES, try AC_CHECK_LIB. If that
also fails, abort configure. If a user passes --with-libsodium-libs explicitly,
that overrides the pkg-config found location.
@nurupo
Copy link
Member

nurupo commented Aug 17, 2016

:lgtm:


Reviewed 2 of 2 files at r1.
Review status: all files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@iphydf iphydf closed this Aug 17, 2016
@iphydf iphydf deleted the libsodium-pkgconfig branch August 17, 2016 20:58
@iphydf iphydf merged commit 2fc5449 into TokTok:master Aug 17, 2016
@iphydf iphydf modified the milestone: v0.0.1 Nov 6, 2016
zugz pushed a commit to zugz/c-toxcore that referenced this pull request Jan 2, 2018
This pull request was closed.
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.

2 participants