Merge commit '1f1ad8ace040a08edc2646ff638ca42a8828779f'

* commit '1f1ad8ace040a08edc2646ff638ca42a8828779f':
  configure: Document --enable-libfontconfig

Merged-by: Clément Bœsch <u@pkh.me>

diff --cc configure
index f9e6ab8,5208804..e6ebd3b
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -203,46 -185,23 +203,46 @@@ Individual component options
    --disable-filters        disable all filters
  
  External library support:
 +  --disable-audiotoolbox   enable AudioToolbox decoders and encoders [autodetect]
    --enable-avisynth        enable reading of AviSynth script files [no]
 -  --enable-bzlib           enable bzlib [autodetect]
 -  --enable-frei0r          enable frei0r video filtering
 -  --enable-gnutls          enable gnutls [no]
 +  --disable-bzlib          disable bzlib [autodetect]
 +  --enable-chromaprint     enable audio fingerprinting with chromaprint [no]
-   --enable-fontconfig      enable fontconfig, useful for drawtext filter [no]
 +  --enable-frei0r          enable frei0r video filtering [no]
 +  --enable-gcrypt          enable gcrypt, needed for rtmp(t)e support
 +                           if openssl, librtmp or gmp is not used [no]
 +  --enable-gmp             enable gmp, needed for rtmp(t)e support
 +                           if openssl or librtmp is not used [no]
 +  --enable-gnutls          enable gnutls, needed for https support
 +                           if openssl is not used [no]
 +  --disable-iconv          disable iconv [autodetect]
 +  --enable-jni             enable JNI support [no]
 +  --enable-ladspa          enable LADSPA audio filtering [no]
 +  --enable-libass          enable libass subtitles rendering,
 +                           needed for subtitles and ass filter [no]
 +  --enable-libbluray       enable BluRay reading using libbluray [no]
    --enable-libbs2b         enable bs2b DSP library [no]
 -  --enable-libcdio         enable audio CD grabbing with libcdio
 +  --enable-libcaca         enable textual display using libcaca [no]
 +  --enable-libcelt         enable CELT decoding via libcelt [no]
 +  --enable-libcdio         enable audio CD grabbing with libcdio [no]
    --enable-libdc1394       enable IIDC-1394 grabbing using libdc1394
                             and libraw1394 [no]
 -  --enable-libdcadec       enable DCA decoding via libdcadec [no]
 +  --enable-libebur128      enable libebur128 for EBU R128 measurement,
 +                           needed for loudnorm filter [no]
    --enable-libfaac         enable AAC encoding via libfaac [no]
    --enable-libfdk-aac      enable AAC de/encoding via libfdk-aac [no]
 -  --enable-libfontconfig   enable libfontconfig [no]
 -  --enable-libfreetype     enable libfreetype [no]
 +  --enable-libflite        enable flite (voice synthesis) support via libflite [no]
++  --enable-libfontconfig   enable libfontconfig, useful for drawtext filter [no]
 +  --enable-libfreetype     enable libfreetype, needed for drawtext filter [no]
 +  --enable-libfribidi      enable libfribidi, improves drawtext filter [no]
 +  --enable-libgme          enable Game Music Emu via libgme [no]
    --enable-libgsm          enable GSM de/encoding via libgsm [no]
 +  --enable-libiec61883     enable iec61883 via libiec61883 [no]
    --enable-libilbc         enable iLBC de/encoding via libilbc [no]
    --enable-libkvazaar      enable HEVC encoding via libkvazaar [no]
 +  --enable-libmodplug      enable ModPlug via libmodplug [no]
    --enable-libmp3lame      enable MP3 encoding via libmp3lame [no]
 +  --enable-libnut          enable NUT (de)muxing via libnut,
 +                           native (de)muxer exists [no]
    --enable-libnpp          enable NVIDIA Performance Primitives-based code [no]
    --enable-libopencore-amrnb enable AMR-NB de/encoding via libopencore-amrnb [no]
    --enable-libopencore-amrwb enable AMR-WB decoding via libopencore-amrwb [no]