diff options
author | irungentoo <irungentoo@gmail.com> | 2014-05-27 08:54:47 -0400 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2014-05-27 08:54:47 -0400 |
commit | 68511f4e3f4a66c42021efab724db7768185b030 (patch) | |
tree | 5be58a8ccd95280abf57ffe2cd4dd39a58c891a6 /configure.ac | |
parent | 42675ed215285521a779e2ff2ec2667655d5f163 (diff) | |
parent | 9528f7c18761033be2c405d0117f17e9a71f7d87 (diff) |
Merge branch 'stqism-master'
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 2f216136..e3b9a77b 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -2,7 +2,7 @@ | |||
2 | # Process this file with autoconf to produce a configure script. | 2 | # Process this file with autoconf to produce a configure script. |
3 | 3 | ||
4 | AC_PREREQ([2.65]) | 4 | AC_PREREQ([2.65]) |
5 | AC_INIT([tox], [0.0.0], [http://tox.im]) | 5 | AC_INIT([tox], [0.0.0], [https://tox.im]) |
6 | AC_CONFIG_AUX_DIR(configure_aux) | 6 | AC_CONFIG_AUX_DIR(configure_aux) |
7 | AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) | 7 | AC_CONFIG_SRCDIR([toxcore/net_crypto.c]) |
8 | AC_CONFIG_HEADERS([config.h]) | 8 | AC_CONFIG_HEADERS([config.h]) |
@@ -178,13 +178,13 @@ AC_ARG_ENABLE([daemon], | |||
178 | ] | 178 | ] |
179 | ) | 179 | ) |
180 | 180 | ||
181 | AC_ARG_ENABLE([nort], | 181 | AC_ARG_ENABLE([rt], |
182 | [AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ], | 182 | [AC_HELP_STRING([--disable-rt], [Disables the librt check (default: auto)]) ], |
183 | [ | 183 | [ |
184 | if test "x$enableval" = "xno"; then | 184 | if test "x$enableval" = "xno"; then |
185 | DISABLE_RT="no" | ||
186 | elif test "x$enableval" = "xyes"; then | ||
187 | DISABLE_RT="yes" | 185 | DISABLE_RT="yes" |
186 | elif test "x$enableval" = "xyes"; then | ||
187 | DISABLE_RT="no" | ||
188 | fi | 188 | fi |
189 | ] | 189 | ] |
190 | ) | 190 | ) |
@@ -295,6 +295,11 @@ AM_CONDITIONAL(WIN32, test "x$WIN32" = "xyes") | |||
295 | 295 | ||
296 | AC_SUBST(EXTRA_LT_LDFLAGS) | 296 | AC_SUBST(EXTRA_LT_LDFLAGS) |
297 | 297 | ||
298 | # Needed math flags for some compilers | ||
299 | |||
300 | MATH_LDFLAGS="-lm" | ||
301 | AC_SUBST(MATH_LDFLAGS) | ||
302 | |||
298 | # Checks for libraries. | 303 | # Checks for libraries. |
299 | 304 | ||
300 | if test "x$WANT_NACL" = "xyes"; then | 305 | if test "x$WANT_NACL" = "xyes"; then |