From: James Almer <jamrial@gmail.com>
Date: Sun, 12 Nov 2017 02:09:21 +0000 (-0300)
Subject: Merge commit 'c6496de33456f20144b994ac38f308f2de333608'
X-Git-Tag: n4.1-dev~1647
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/3e9fd83592cf102a40512386fdca5a4a3f5a06fb

Merge commit 'c6496de33456f20144b994ac38f308f2de333608'

* commit 'c6496de33456f20144b994ac38f308f2de333608':
  configure: Move enabling libc_type into probe_libc() function

Merged-by: James Almer <jamrial@gmail.com>
---

3e9fd83592cf102a40512386fdca5a4a3f5a06fb
diff --cc configure
index e7b06d4,706f107..b5a45ef
--- a/configure
+++ b/configure
@@@ -5256,16 -4143,11 +5256,17 @@@ EO
      elif check_${pfx}cpp_condition sys/brand.h "defined LABELED_BRAND_NAME"; then
          eval ${pfx}libc_type=solaris
          add_${pfx}cppflags -D__EXTENSIONS__ -D_XOPEN_SOURCE=600
 -    else
 -        eval ${pfx}libc_type=default
 -        add_${pfx}cppflags -D_DEFAULT_SOURCE
      fi
 +    check_${pfx}cc <<EOF
 +#include <time.h>
 +void *v = localtime_r;
 +EOF
 +test "$?" != 0 && check_${pfx}cc -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 <<EOF && add_${pfx}cppflags -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600
 +#include <time.h>
 +void *v = localtime_r;
 +EOF
 +
+     eval test -n "\${${pfx}libc_type}" && enable ${pfx}libc_${libc_type}
  }
  
  probe_libc