ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Nov 12 00:39:41 2017 -0300| [e55781954fdc23de1d17dbdca73e3b7006460c80] | committer: James Almer
Merge commit '192fe52e42f64a493c47cad1461b20fe1149dbea' * commit '192fe52e42f64a493c47cad1461b20fe1149dbea': configure: Miscellaneous minor changes to config file handling Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e55781954fdc23de1d17dbdca73e3b7006460c80 --- configure | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/configure b/configure index c0f3706c05..4cdb3370d7 100755 --- a/configure +++ b/configure @@ -5233,12 +5233,6 @@ esac check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" || add_cppflags '-I\$(SRC_PATH)/compat/float' -esc(){ - echo "$*" | sed 's/%/%25/g;s/:/%3a/g' -} - -echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate - check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic set_default libdir @@ -6742,12 +6736,21 @@ fi echo "License: $license" -echo "Creating configuration files ..." - fi # test "$quiet" != "yes" +if test -n "$WARNINGS"; then + printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" + enabled fatal_warnings && exit 1 +fi + test -e Makefile || echo "include $source_path/Makefile" > Makefile +esc(){ + echo "$*" | sed 's/%/%25/g;s/:/%3a/g' +} + +echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate + enabled stripping || strip="echo skipping strip" enabled stripping || striptype="" @@ -6923,7 +6926,9 @@ test -n "$malloc_prefix" && if enabled x86asm; then append config_files $TMPASM - printf '' >$TMPASM + cat > $TMPASM <<EOF +; Automatically generated by configure - do not modify! +EOF fi enabled getenv || echo "#define getenv(x) NULL" >> $TMPH @@ -6950,7 +6955,7 @@ touch ffbuild/.config enabled x86asm && cp_if_changed $TMPASM config.asm cat > $TMPH <<EOF -/* Generated by ffconf */ +/* Generated by ffmpeg configure */ #ifndef AVUTIL_AVCONFIG_H #define AVUTIL_AVCONFIG_H EOF @@ -6978,11 +6983,6 @@ print_enabled_components(){ print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST -if test -n "$WARNINGS"; then - printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" - enabled fatal_warnings && exit 1 -fi - # Settings for pkg-config files cat > ffbuild/config.sh <<EOF ====================================================================== diff --cc configure index c0f3706c05,fc45fde2d4..4cdb3370d7 --- a/configure +++ b/configure @@@ -5233,18 -4109,8 +5233,12 @@@ esa check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" || add_cppflags '-I\$(SRC_PATH)/compat/float' - esc(){ - echo "$*" | sed 's/%/%25/g;s/:/%3a/g' - } - - echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate - check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic +set_default libdir +: ${shlibdir_default:="$libdir"} +: ${pkgconfigdir_default:="$libdir/pkgconfig"} + set_default $PATHS_LIST set_default nm @@@ -6740,24 -5173,36 +6734,33 @@@ if test -n "$ignore_tests"; the echo fi -license="LGPL version 2.1 or later" -if enabled nonfree; then - license="nonfree and unredistributable" -elif enabled gplv3; then - license="GPL version 3 or later" -elif enabled lgplv3; then - license="LGPL version 3 or later" -elif enabled gpl; then - license="GPL version 2 or later" -fi - echo "License: $license" - echo "Creating configuration files ..." - fi # test "$quiet" != "yes" -test -n "$WARNINGS" && printf "\n$WARNINGS" ++if test -n "$WARNINGS"; then ++ printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" ++ enabled fatal_warnings && exit 1 ++fi + test -e Makefile || echo "include $source_path/Makefile" > Makefile + esc(){ + echo "$*" | sed 's/%/%25/g;s/:/%3a/g' + } + -echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" > avbuild/config.fate ++echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $FFMPEG_CONFIGURATION)" > ffbuild/config.fate ++ +enabled stripping || strip="echo skipping strip" +enabled stripping || striptype="" -config_files="$TMPH avbuild/config.mak" +config_files="$TMPH ffbuild/config.mak doc/config.texi" -cat > avbuild/config.mak <<EOF +cat > ffbuild/config.mak <<EOF # Automatically generated by configure - do not modify! -LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION +ifndef FFMPEG_CONFIG_MAK +FFMPEG_CONFIG_MAK=1 +FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION prefix=$prefix LIBDIR=\$(DESTDIR)$libdir SHLIBDIR=\$(DESTDIR)$shlibdir @@@ -6950,7 -5357,7 +6955,7 @@@ touch ffbuild/.confi enabled x86asm && cp_if_changed $TMPASM config.asm cat > $TMPH <<EOF - /* Generated by ffconf */ -/* Generated by libav configure */ ++/* Generated by ffmpeg configure */ #ifndef AVUTIL_AVCONFIG_H #define AVUTIL_AVCONFIG_H EOF @@@ -6978,17 -5385,11 +6983,12 @@@ print_enabled_components() print_enabled_components libavcodec/bsf_list.c AVBitStreamFilter bitstream_filters $BSF_LIST print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $PROTOCOL_LIST - if test -n "$WARNINGS"; then - printf "\n%s%s$WARNINGS%s" "$warn_color" "$bold_color" "$reset_color" - enabled fatal_warnings && exit 1 - fi - # Settings for pkg-config files -cat > avbuild/config.sh <<EOF +cat > ffbuild/config.sh <<EOF # Automatically generated by configure - do not modify! shared=$shared +build_suffix=$build_suffix prefix=$prefix libdir=$libdir incdir=$incdir _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
