ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sat Nov 11 23:09:21 2017 -0300| [3e9fd83592cf102a40512386fdca5a4a3f5a06fb] | committer: James Almer
Merge commit 'c6496de33456f20144b994ac38f308f2de333608' * commit 'c6496de33456f20144b994ac38f308f2de333608': configure: Move enabling libc_type into probe_libc() function Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e9fd83592cf102a40512386fdca5a4a3f5a06fb --- configure | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/configure b/configure index e7b06d4305..b5a45ef7d8 100755 --- a/configure +++ b/configure @@ -5266,12 +5266,11 @@ test "$?" != 0 && check_${pfx}cc -D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 << void *v = localtime_r; EOF + eval test -n "\${${pfx}libc_type}" && enable ${pfx}libc_${libc_type} } probe_libc -test -n "$libc_type" && enable libc_$libc_type probe_libc host_ -test -n "$host_libc_type" && enable host_libc_$host_libc_type # hacks for compiler/libc/os combinations ====================================================================== diff --cc configure index e7b06d4305,706f1073ee..b5a45ef7d8 --- 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 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
