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.

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

autotools: check for ssl.h if pkg-config failed #30

Closed
wants to merge 6 commits into from
Closed

autotools: check for ssl.h if pkg-config failed #30

wants to merge 6 commits into from

Conversation

fabianfreyer
Copy link
Contributor

This enables building against the base FreeBSD openssl and does not require the openssl port, which breaks things, such as base ssh on FreeBSD

@fabianfreyer
autotools: check for ssl.h if pkg-config failed
328bf36 
Some distros provides libssl without openssl.pc.
@pasis
Copy link
Member

pasis commented Aug 8, 2014

Is -lssl enough for linking? Usually I see -lz and -lcrypto as dependencies. And would it be better to make such a check for freebsd only?

P.S. just suggestion: make a separate branch for every pull request. This avoids problems with squash commits, rebases and when some other commits pushed before yours.

@fabianfreyer
Copy link
Contributor Author

-lssl seems to be enough, at least it works for me. there seem to be no calls to -lz and -lcrypto. I have tested this on freebsd and OS X, works for both. Unfortunately I don't have a linux machine right now, but I'll check that later.

Normally I use git-flow, but my earlier pull request started out as a series of quick'n-dirty fixes that matured over time, so they were unfortunately all done to master. Anyways, I fixed my repository.

@fabianfreyer fabianfreyer mentioned this pull request Aug 26, 2014
Closed
@fabianfreyer fabianfreyer mentioned this pull request Aug 26, 2014
Closed
tdi
tdi reviewed Aug 26, 2014
View reviewed changes
bootstrap.sh
@@ -1,3 +1,4 @@
#!/bin/sh

mkdir -p m4
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 that autoreconf on linux creates this directory, so this line is not needed. do not know how about FreeBSD though

@fabianfreyer
Copy link
Contributor Author

I tested this on Mac OS X and autoreconf threw the following warning:

~/Projects/libstrophe (master*) $ ./bootstrap.sh
aclocal: warning: couldn't open directory 'm4': No such file or directory
glibtoolize: putting auxiliary files in `.'.
glibtoolize: copying file `./ltmain.sh'
glibtoolize: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
glibtoolize: copying file `m4/libtool.m4'
glibtoolize: copying file `m4/ltoptions.m4'
glibtoolize: copying file `m4/ltsugar.m4'
glibtoolize: copying file `m4/ltversion.m4'
glibtoolize: copying file `m4/lt~obsolete.m4'
configure.ac:4: installing './compile'
configure.ac:4: installing './config.guess'
configure.ac:4: installing './config.sub'
configure.ac:3: installing './install-sh'
configure.ac:3: installing './missing'
Makefile.am: installing './depcomp'

Yes, m4/ was created, so this line is technically not needed, however I thought it'd be prudent to address this warning. I can remove the mkdir line though.

@tdi
Copy link
Contributor

tdi commented Aug 26, 2014

I think this warning is ok, just creates the dir for us.

@fabianfreyer
Copy link
Contributor Author

Ok, I have removed it.

@fabianfreyer
Copy link
Contributor Author

I have tested this on OS X and FreeBSD.

@fabianfreyer fabianfreyer mentioned this pull request Sep 25, 2014
Closed
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Sep 26, 2014
@fabianfreyer
Added patches to compile on freebsd
00ce230 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
@fabianfreyer fabianfreyer mentioned this pull request Sep 26, 2014
Closed
@pasis
Copy link
Member

pasis commented Sep 30, 2014

Merged: dcbf3fb and e2acd98

@pasis pasis closed this Sep 30, 2014
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014
@fabianfreyer
Added patches to compile on freebsd
2f3f1b6 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014
@fabianfreyer
Added patches to compile on freebsd
d1f4f2d 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014
@fabianfreyer
Added patches to compile on freebsd
b52ec90 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014
@fabianfreyer
Added patches to compile on freebsd
40c2f4b 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 7, 2014
@fabianfreyer
Added patches to compile on freebsd
e338ae4 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
fabianfreyer added a commit to fabianfreyer/libstrophe that referenced this pull request Oct 8, 2014
@fabianfreyer
Added patches to compile on freebsd
dbe6415 
These are currently pull requests:
strophe#30
strophe#37

Once these are merged, and a new release is made, this commit can be
reverted.
@boothj5 boothj5 added this to the 0.8.7 milestone Oct 21, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
0.8.7
Development

Successfully merging this pull request may close these issues.
4 participants
@fabianfreyer @pasis @tdi @boothj5