Merge branch 'rakshasa:master' into master

configure.ac

@@ -1,10 +1,14 @@
-AC_INIT(libtorrent, 0.13.8, [email protected])
+AC_INIT([[libtorrent]],[[0.13.8]],[[[email protected]]])
 
-LT_INIT([disable-static])
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIRS([scripts])
+AM_INIT_AUTOMAKE([serial-tests subdir-objects foreign])
+
+LT_INIT([[disable-static]])
 
 dnl Find a better way to do this
-AC_DEFINE(PEER_NAME, "-lt0D80-", Identifier that is part of the default peer id)
-AC_DEFINE(PEER_VERSION, "lt\x0D\x80", 4 byte client and version identifier for DHT)
+AC_DEFINE([[PEER_NAME]], [["-lt0D80-"]], [[Identifier that is part of the default peer id.]])
+AC_DEFINE([[PEER_VERSION]], [["lt\x0D\x80"]], [[4 byte client and version identifier for DHT.]])
 
 LIBTORRENT_CURRENT=21
 LIBTORRENT_REVISION=0
@@ -17,26 +21,22 @@ AC_SUBST(LIBTORRENT_CURRENT)
 AC_SUBST(LIBTORRENT_INTERFACE_VERSION_INFO)
 AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO)
 
-AM_INIT_AUTOMAKE([serial-tests subdir-objects])
-AC_CONFIG_HEADERS(config.h)
-
 AC_PROG_CXX
 AC_SYS_LARGEFILE
 
 AC_C_BIGENDIAN(
-    AC_DEFINE(IS_BIG_ENDIAN, 1, Big endian),
-    AC_DEFINE(IS_LITTLE_ENDIAN, 1, Little endian),
-    AC_MSG_ERROR([Could not determine endianness])
+  AC_DEFINE(IS_BIG_ENDIAN, 1, Big endian),
+  AC_DEFINE(IS_LITTLE_ENDIAN, 1, Little endian),
+  AC_MSG_ERROR([Could not determine endianness])
 )
 
+AX_CXX_COMPILE_STDCXX(14, noext, mandatory)
+
 RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
 RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
 RAK_ENABLE_WERROR
-RAK_DISABLE_BACKTRACE
-
-RAK_CHECK_CXX11
 
 TORRENT_ENABLE_ALIGNED
 TORRENT_ENABLE_INTERRUPT_SOCKET
@@ -55,7 +55,25 @@ TORRENT_WITHOUT_STATVFS
 TORRENT_WITHOUT_STATFS
 TORRENT_WITH_INOTIFY
 
-CC_ATTRIBUTE_VISIBILITY
+AC_ARG_ENABLE(attribute-visibility,
+  AS_HELP_STRING([--disable-attribute-visibility],[disable symbol visibility attribute [[default=enable]]]),
+  [
+    if test "$enableval" = "yes"; then
+      CC_ATTRIBUTE_VISIBILITY
+    fi
+  ],[
+    CC_ATTRIBUTE_VISIBILITY
+  ])
+
+AC_ARG_ENABLE(execinfo,
+  AS_HELP_STRING([--disable-execinfo],[disable libexecinfo [[default=enable]]]),
+  [
+    if test "$enableval" = "yes"; then
+      AX_EXECINFO
+    fi
+  ],[
+    AX_EXECINFO
+  ])
 
 AX_CHECK_ZLIB
 AX_PTHREAD
@@ -71,11 +89,11 @@ TORRENT_ARG_CYRUS_RC4
 
 AC_CHECK_FUNCS(posix_memalign)
 
-TORRENT_CHECK_MADVISE()
-TORRENT_CHECK_CACHELINE()
-TORRENT_CHECK_POPCOUNT()
-TORRENT_CHECK_PTHREAD_SETNAME_NP()
-TORRENT_MINCORE()
+TORRENT_CHECK_MADVISE
+TORRENT_CHECK_CACHELINE
+TORRENT_CHECK_POPCOUNT
+TORRENT_DISABLE_PTHREAD_SETNAME_NP
+TORRENT_MINCORE
 
 TORRENT_DISABLE_INSTRUMENTATION
 
@@ -88,16 +106,17 @@ AC_SUBST(LIBTORRENT_CFLAGS)
 AC_DEFINE(HAVE_CONFIG_H, 1, true if config.h was included)
 
 CC_ATTRIBUTE_UNUSED(
-	AC_DEFINE([__UNUSED], [__attribute__((unused))], [Wrapper around unused attribute]),
-	AC_DEFINE([__UNUSED], [], [Null-wrapper if unused attribute is unsupported])
+  AC_DEFINE([__UNUSED], [__attribute__((unused))], [Wrapper around unused attribute]),
+  AC_DEFINE([__UNUSED], [], [Null-wrapper if unused attribute is unsupported])
 )
 
-AC_OUTPUT([
+AC_CONFIG_FILES([
 	libtorrent.pc
 	Makefile
 	src/Makefile
 	src/torrent/Makefile
-        test/Makefile
-        test/torrent/net/Makefile
-        test/net/Makefile
+  test/Makefile
+  test/torrent/net/Makefile
+  test/net/Makefile
 ])
+AC_OUTPUT

scripts/ax_check_zlib.m4

@@ -1,5 +1,5 @@
 # ===========================================================================
-#       http://www.gnu.org/software/autoconf-archive/ax_check_zlib.html
+#      https://www.gnu.org/software/autoconf-archive/ax_check_zlib.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -47,7 +47,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure
@@ -62,7 +62,7 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 14
+#serial 16
 
 AU_ALIAS([CHECK_ZLIB], [AX_CHECK_ZLIB])
 AC_DEFUN([AX_CHECK_ZLIB],
@@ -108,11 +108,10 @@ then
         LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib"
         CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include"
   fi
-  AC_LANG_SAVE
-  AC_LANG_C
+  AC_LANG_PUSH([C])
   AC_CHECK_LIB([z], [inflateEnd], [zlib_cv_libz=yes], [zlib_cv_libz=no])
   AC_CHECK_HEADER([zlib.h], [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
-  AC_LANG_RESTORE
+  AC_LANG_POP([C])
   if test "$zlib_cv_libz" = "yes" && test "$zlib_cv_zlib_h" = "yes"
   then
     #