Merge branch 'master' into remove_old_demuxers

Conflicts:
	DOCS/man/en/changes.rst
	DOCS/man/en/options.rst

1 files changed, 17 insertions, 1 deletions

diff --git a/configure b/configure
index 2c9b98e04d..f84cff678d 100755
--- a/configure
+++ b/configure
@@ -1271,6 +1271,22 @@ else
 fi
 echores "$_pthreads"
 
+if test "$_pthreads" = yes ; then
+
+# Cargo-cult for -lrt, which is needed on not so recent glibc version for
+# clock_gettime. It's documented as required before before glibc 2.17, which
+# was released in december 2012. On newer glibc versions or on other systems,
+# this will hopefully do nothing.
+echocheck "linking with -lrt"
+_rt=no
+cc_check "$_ld_pthread -lrt" && _rt=yes
+if test "$_rt" = yes ; then
+  _ld_pthread="$_ld_pthread -lrt"
+fi
+echores "$_rt"
+
+fi
+
 echocheck "stream cache"
 _stream_cache="$_pthreads"
 if test "$_stream_cache" = yes ; then
@@ -2452,7 +2468,7 @@ if test "$_zlib" = yes ; then
   def_zlib='#define CONFIG_ZLIB 1'
   libs_mplayer="$libs_mplayer -lz"
 else
-  def_zlib='#define CONFIG_ZLIB 0'
+  die "Unable to find development files for zlib."
 fi
 echores "$_zlib"