ffmpeg | branch: master | James Almer <[email protected]> | Wed Sep 27 12:23:50 2017 -0300| [e00e8639b22a06b77ada2b906a4b1ccdb373adc1] | committer: James Almer
Merge commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5' * commit '71a49fe25f2e4468fbbadbebef8d073b1b3cc1a5': configure: Use cppflags check helper functions where appropriate Merged-by: James Almer <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e00e8639b22a06b77ada2b906a4b1ccdb373adc1 --- configure | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a8b1f3fea5..2cd727ea2f 100755 --- a/configure +++ b/configure @@ -4816,18 +4816,12 @@ check_cxxflags -std=c++11 || check_cxxflags -std=c++0x # some compilers silently accept -std=c11, so we also need to check that the # version macro is defined properly -if test_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L"; then - add_cflags -std=c11 -else +check_cpp_condition ctype.h "__STDC_VERSION__ >= 201112L" -std=c11 && + add_cflags -std=c11 || check_cflags -std=c99 -fi -check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64 -#include <stdlib.h> -EOF -check_cc -D_LARGEFILE_SOURCE <<EOF && add_cppflags -D_LARGEFILE_SOURCE -#include <stdlib.h> -EOF +check_cppflags -D_FILE_OFFSET_BITS=64 +check_cppflags -D_LARGEFILE_SOURCE add_host_cppflags -D_ISOC99_SOURCE check_host_cflags -std=c99 ====================================================================== diff --cc configure index a8b1f3fea5,c2580a3650..2cd727ea2f --- a/configure +++ b/configure @@@ -4816,18 -3774,12 +4816,12 @@@ check_cxxflags -std=c++11 || check_cxxf # some compilers silently accept -std=c11, so we also need to check that the # version macro is defined properly - if test_cflags_cc -std=c11 ctype.h "__STDC_VERSION__ >= 201112L"; then - add_cflags -std=c11 - else -check_cpp_condition stdlib.h "__STDC_VERSION__ >= 201112L" -std=c11 && ++check_cpp_condition ctype.h "__STDC_VERSION__ >= 201112L" -std=c11 && + add_cflags -std=c11 || check_cflags -std=c99 - fi - check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64 - #include <stdlib.h> - EOF - check_cc -D_LARGEFILE_SOURCE <<EOF && add_cppflags -D_LARGEFILE_SOURCE - #include <stdlib.h> - EOF + check_cppflags -D_FILE_OFFSET_BITS=64 + check_cppflags -D_LARGEFILE_SOURCE add_host_cppflags -D_ISOC99_SOURCE check_host_cflags -std=c99 _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
