Commit ca5323af authored by Roberto Togni's avatar Roberto Togni

Move printing of the license status at the end of configure output, so

that users won't miss it

Originally committed as revision 11450 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8e4270c5
...@@ -1907,9 +1907,6 @@ echo "libvorbis enabled ${libvorbis-no}" ...@@ -1907,9 +1907,6 @@ echo "libvorbis enabled ${libvorbis-no}"
echo "x264 enabled ${libx264-no}" echo "x264 enabled ${libx264-no}"
echo "XviD enabled ${libxvid-no}" echo "XviD enabled ${libxvid-no}"
echo "zlib enabled ${zlib-no}" echo "zlib enabled ${zlib-no}"
enabled gpl &&
echo "License: GPL" ||
echo "License: LGPL"
for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do for type in decoder encoder parser demuxer muxer protocol bsf indev outdev; do
echo "Enabled ${type}s:" echo "Enabled ${type}s:"
...@@ -1925,6 +1922,10 @@ done ...@@ -1925,6 +1922,10 @@ done
echo "Creating config.mak and config.h..." echo "Creating config.mak and config.h..."
enabled gpl &&
echo "License: GPL" ||
echo "License: LGPL"
echo "# Automatically generated by configure - do not modify!" > config.mak echo "# Automatically generated by configure - do not modify!" > config.mak
echo "/* Automatically generated by configure - do not modify! */" > $TMPH echo "/* Automatically generated by configure - do not modify! */" > $TMPH
echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH echo "#ifndef FFMPEG_CONFIG_H" >> $TMPH
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment