Commit Graph

35 Commits

Author SHA1 Message Date
mannol
9db41e7582 Merge remote-tracking branch 'upstream/master' into Multicalls-patch 2014-05-22 00:08:19 +02:00
mannol
a1f2a18ae4 Merge upstream and other stuff 2014-05-20 00:10:40 +02:00
stal
8e5e89b871 configure.ac: Don't check for clock_gettime on OS X
We don't need it anymore. jin-eld pls do not kill
2014-05-19 14:43:36 -07:00
irungentoo
ff4368add7
Fixed build by adding librt to build system. 2014-05-10 16:09:44 -04:00
mannol
0fa03b9240 Bunch of random changes 2014-05-03 01:46:03 +02:00
mannol
42b25a4d3e Yeah many calls 2014-04-27 19:21:26 +02:00
Carlos E. Garcia
49e160450c whitespace fix & proper use of "i.e.," 2014-04-09 18:49:15 -04:00
Dmitrij D. Czarkoff
33eede5a06 Add /usr/local/{include,lib} to search paths on OpenBSD 2014-04-08 20:04:59 +02:00
Jin^eLD
70475d281d Fix NaCl builds for *BSD
From what I see there is a difference between *BSD and Linux when
linking vs. toxcore which has been bulit vs. the NaCl library:

on Linux it only links if NaCl's object files (i.e. randombytes.o) is
present in the linker options, however on *BSD systems this will cause a
linking error, see:
https://github.com/Tox/toxic/issues/31#issuecomment-38224441

This commit makes sure that we do not add the NaCl object files to our
pkg-config settings on *BSD, but do add them on Linux.
2014-03-23 02:05:57 +01:00
Jin^eLD
ba4681ef1e Fix shared/static settings when building vs. NaCl library
Make sure the shared lib build is really disabled when compiling vs.
NaCl:

moved settings before libtool initialization
fixed parameter name
2014-03-23 02:05:34 +01:00
Jin^eLD
63c50c8302 Fix regression that disabled shared library builds
My previous attempt that was supposed to disable shared library builds
with nacl had a side effect which basically disabled shared libs for all
configurations.

Eventhough AC_DISABLE_SHARED was used inside an if clause it seemed to
take over in any case.

I could not find a clean way around this, so had to override internal
libtool variables. Will check with the libtool people regarding a
cleaner implementation.
2014-03-18 11:35:28 +01:00
Jin^eLD
8974ed8327 Disabled shared lib when building vs. nacl library 2014-03-18 01:39:54 +01:00
mannol
6a78e2e71c Fixed several bugs and added some features 2014-03-07 03:13:04 +01:00
AZ Huang
7f3e1aec52 Fix libtoxav link error. 2014-03-05 20:04:19 +08:00
Jin^eLD
4cd3d91263 Allow to optionally use randombytes_stir() instead of sodium_init()
According to sonOfRa sodium_init() has some timing issues on Android.
libsodium people said randombytes_stir() can be used instead:
https://github.com/jedisct1/libsodium/issues/121

sodium_init() stays the default, randombytes_stir() can be enabled by
passing --enable-randombytes-stir to the configure script.
2014-02-25 23:40:42 +01:00
mannol
4888d916d0 pkg-config and av 2014-02-23 23:13:38 +01:00
mannol
186c852aa6 Ugh 2014-02-18 00:35:26 +01:00
mannol
272ed7e6db Moved event to toxav 2014-02-16 19:11:55 -05:00
mannol
393433ce99 Public header ready to go 2014-02-16 19:11:55 -05:00
mannol
984c564cba Added fixes to rtp and updated phone 2014-02-01 12:44:08 +01:00
Jin^eLD
07d334bbe3 Do not build tox_sync on win32 2013-10-16 18:03:33 +02:00
mannol
5bc2560904 tox A/V: integration of A/V code into tox
Also-by: Sergey 'Jin' Bostandzhyan <jin@mediatomb.cc>
2013-10-13 16:40:15 +02:00
BtbN
8d40ddf417 Some configuration/build fixes, so building basicaly everything else than the library can be disabled 2013-10-07 02:01:16 +02:00
Jin^eLD
e092eee869 Allow to build vs nacl instead of libsodium
By default libsodium is used. Only if --enable-nacl is specified, then
nacl will be used instead of libsodium.

Pass locations of nacl headers and libraries by using the following
options:

--with-nacl-headers=/home/me/somewhere/nacl-20110221/build/469/include/amd64/
--with-nacl-libs=/home/me/somewhere/nacl-20110221/build/469/lib/amd64/
2013-09-06 22:54:45 +03:00
jin-eld
7d29bd23b9 Forward compatibility with automake 1.14
This update makes sure that the build still works with automake prior to
1.12 and at the same time does not give any warnings or errors with
automake 1.14
2013-09-01 20:39:02 +03:00
irungentoo
ea994606fe Merge branch 'master' of https://github.com/JamoBox/ProjectTox-Core into JamoBox-master
Conflicts:
	toxcore/LAN_discovery.h
2013-08-29 17:55:58 -04:00
pete
82b8927af7 Correct a lot of the grammar and spelling. Also spent a few hours fixing the comments so they follow a standard. 2013-08-29 22:17:51 +01:00
jin-eld
14a8ee4e0d Make nTox work on MinGW/Win32 2013-08-27 14:25:09 +03:00
jin-eld
ed1c130ebc Move extra libtool options into configure
This should allow to keep the libtool options all in one place and at
the same time define different options depending on the host.

Made sure that -no-undefined is set only on Win32. Although no side
effects on Linux and OSX have been observed so far, it's probably better
to play it safe; it does not seem to be needed/does not seem to matter on *nix,
only required for Win32.
2013-08-26 22:08:43 +03:00
jin-eld
7ce599d180 Fix trailing whitespace 2013-08-26 22:08:33 +03:00
jin-eld
2fa0b69631 Add /usr/local/* to search paths on FreeBSD
Seems that on FreeBSD those directories are not in the default search
paths, so we'll have to add them manually.
2013-08-26 14:34:42 +03:00
jin-eld
634a67f627 Also generate a .dll in MinGW builds
Previously only static a static library was produced on MinGW builds,
this PR makes sure that we also build a proper .dll
2013-08-26 02:18:09 +03:00
JamoBox
e44ebb184a fixed typos
fixed a couple of typos in the output messages
2013-08-24 22:59:58 +01:00
jin-eld
fe7e69ac4a Fix typo in configure script help text
It's "bootstrap", not "boostrap" :P
2013-08-24 16:50:11 +03:00
jin-eld
50c8a820e5 Implemented autotools based build scripts
supported options:

--with-dependency-search=DIR    will tell configure to look for various
dependencies in DIR/include and DIR/lib

Alternatively you can also specify libsodium header and libs location
with --with-libsodium-headers and --with-libsodium-libs if it is
installed elsewhere.

Ncurses and libconfig are handled via the default pkg-config way, see
./configure --help=short for detailed information.

The tox library is compiled as libtoxcore in shared and static variants,
public headers are installed to ${prefix}/include/tox

A pkg-config libtoxcore.pc configuration file is provided.

Use ./configure --help for a full list of configure options or
./configure --help=short for the options that I added.

To generate the configure script after pulling from git use:
autoreconf -i

To generate a release tarball use:
make dist

Unit tests are handled by the libcheck library integration that is provided
by autotools, use:
make check

to compile and run the tests.

Unit tests are currently optional, i.e. - if the check library is not
found on the system, then tests will be disabled. Same goes for nTox and
DHT bootstrap daemon - they will be enabled or disabled depending on the
availability of ncurses (for nTox) or libconfig (for DHT bootstrap
daemon).

The above can be also tuned by:
--enable-tests / --disable-tests
--enable-ntox / --disable-ntox
--enable-dht-bootstrap-daemon / --disable-dht-bootstrap-daemon
2013-08-24 03:25:07 +03:00