diff options
| author | Måns Rullgård <mans@mansr.com> | 2006-11-13 22:16:24 +0000 |
|---|---|---|
| committer | Måns Rullgård <mans@mansr.com> | 2006-11-13 22:16:24 +0000 |
| commit | be74741ccd4c9370ab1d7e75d7ee01561795de08 (patch) | |
| tree | 8117ffbb875b4e5c52cb28f9be6036a7c88d2008 /configure | |
| parent | 8e72b130a2c1a5a24606679841e122c3da5867d8 (diff) | |
rename shell variable vorbis to libvorbis
Originally committed as revision 7016 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -435,7 +435,7 @@ libgsm="no" mp3lame="no" libnut="no" libogg="no" -vorbis="no" +libvorbis="no" faad="no" faadbin="no" faac="no" @@ -790,7 +790,7 @@ for opt do --enable-libogg) libogg="yes" pkg_requires="$pkg_requires ogg >= 1.1" ;; - --enable-vorbis) vorbis="yes" + --enable-vorbis) libvorbis="yes" pkg_requires="$pkg_requires vorbis vorbisenc" ;; --enable-faad) faad="yes" @@ -963,7 +963,7 @@ EOF exit 1; fi -if test "$vorbis" = "yes" ; then +if test "$libvorbis" = "yes" ; then if test "$libogg" = "no"; then echo "libogg must be enabled to enable Vorbis." fail="yes" @@ -1335,7 +1335,7 @@ fi enabled dts && require libdts dts.h dts_init -ldts -lm enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled mp3lame && require LAME lame/lame.h lame_init -lmp3lame -lm -enabled vorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg +enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbis -lvorbisenc -logg enabled libogg && require libogg ogg/ogg.h ogg_sync_init -logg enabled libnut && require libnut nut.h nut_demuxer_init -lnut enabled xvid && require XviD xvid.h xvid_global -lxvidcore @@ -1618,7 +1618,7 @@ echo "libgsm enabled $libgsm" echo "mp3lame enabled $mp3lame" echo "libnut enabled $libnut" echo "libogg enabled $libogg" -echo "Vorbis enabled $vorbis" +echo "Vorbis enabled $libvorbis" echo "FAAD enabled $faad" echo "faadbin enabled $faadbin" echo "FAAC enabled $faac" @@ -2027,7 +2027,7 @@ if test "$libogg" = "yes" ; then echo "CONFIG_LIBOGG=yes" >> config.mak fi -if test "$vorbis" = "yes" ; then +if test "$libvorbis" = "yes" ; then echo "#define CONFIG_LIBVORBIS 1" >> $TMPH echo "CONFIG_LIBVORBIS=yes" >> config.mak fi |