Skip to content

PHPC-1075: Import libbson and libmongoc Autotools configuration #829

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 4 commits into from
May 10, 2018
Merged

PHPC-1075: Import libbson and libmongoc Autotools configuration #829

merged 4 commits into from
May 10, 2018

Conversation

jmikola
Copy link
Member

@jmikola jmikola commented May 7, 2018 •
edited
Loading

jmikola added 2 commits May 9, 2018 11:36
@jmikola
PHPC-1185: Support GSSAPI via mongodb-sasl config option
aab92e1 
While libmongoc's CheckSasl.m4 was able to detect Cyrus SASL 1.x, PHPC's config.m4 always required 2.x so we've not imported that bit.

This also prefers native GSSAPI on macOS over Cyrus SASL (PHPC-1142).
@jmikola
PHPC-1185: Warn for unrecognized mongodb-sasl values
88bdd78
@jmikola jmikola requested a review from derickr May 9, 2018 23:37
@jmikola jmikola changed the title [WIP] PHPC-1075: Import libbson and libmongoc Autotools configuration PHPC-1075: Import libbson and libmongoc Autotools configuration May 9, 2018
derickr
derickr approved these changes May 10, 2018
View reviewed changes
Copy link
Contributor

@derickr derickr left a comment

Choose a reason for hiding this comment

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

I think this looks good - aside from the typo. I'm by far not an M4 expert though, so I'd be happy if it just works. I think we should set-up some test plan on what to test to make sure this all works.

config.m4 Outdated

AC_SUBST(MONGOC_NO_AUTOMATIC_GLOBALS, 1)

dnl Capture user-set environment variables for metadata hankshake
Copy link
Contributor

Choose a reason for hiding this comment

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

hanky panky.

Copy link
Member Author

Choose a reason for hiding this comment

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

scripts/build/autotools/m4/ax_pthread.m4
@@ -0,0 +1,334 @@
# ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_pthread.html
Copy link
Contributor

Choose a reason for hiding this comment

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

What do we use threads for?

Copy link
Member Author

Choose a reason for hiding this comment

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

It's optional for libmongoc, but libbson requires it on non-Windows platforms for ObjectId generation: http://mongoc.org/libbson/current/threading.html

@jmikola
Copy link
Member Author

jmikola commented May 10, 2018

I think we should set-up some test plan on what to test to make sure this all works.

Created PHPC-1187 to track that. Likely something we can do after Evergreen is up and running.

@jmikola jmikola merged commit c90422c into mongodb:master May 10, 2018
jmikola added a commit that referenced this pull request May 10, 2018
@jmikola
Merge pull request #829
b4060ab
@jmikola jmikola deleted the phpc-1075 branch May 10, 2018 16:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derickr derickr derickr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@jmikola @derickr