diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:12:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 21:12:57 +0100 |
| commit | a1b92569db6597bb4a662865564e7905a945264f (patch) | |
| tree | 985ad06b36f264cea58e3bfb96a2fc0418110cb6 /configure | |
| parent | 28ee7757f5b0859510e3af6bf49fca9881f09966 (diff) | |
| parent | 5926603ad65e5fd4fefe8f0d72c381059f71cd59 (diff) | |
| download | ffmpeg-a1b92569db6597bb4a662865564e7905a945264f.tar.gz | |
Merge commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59'
* commit '5926603ad65e5fd4fefe8f0d72c381059f71cd59':
configure: Document --pkg-config option
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -270,6 +270,7 @@ Advanced options (experts only): --target-samples=DIR path to samples directory on target --tempprefix=PATH force fixed dir/prefix instead of mktemp for checks --toolchain=NAME set tool defaults according to NAME + --pkg-config=PKGCONFIG use pkg-config tool PKGCONFIG [$pkg_config_default] --nm=NM use nm tool NM [$nm_default] --ar=AR use archive tool AR [$ar_default] --as=AS use assembler AS [$as_default] |