diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 18:00:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-19 18:00:20 +0200 |
| commit | a68c05cf13c986b73b0932e8eb6aaf7f9cb0f37f (patch) | |
| tree | 63091a4886ec73e1405fff4a346707236a9ec404 | |
| parent | 47c8d1e174b8677bb3c9f6e2ce0c37907b3a8886 (diff) | |
| parent | 852c329a69ddfd635807f60454df07d021c64901 (diff) | |
| download | ffmpeg-streaming-a68c05cf13c986b73b0932e8eb6aaf7f9cb0f37f.zip ffmpeg-streaming-a68c05cf13c986b73b0932e8eb6aaf7f9cb0f37f.tar.gz | |
Merge commit '852c329a69ddfd635807f60454df07d021c64901'
* commit '852c329a69ddfd635807f60454df07d021c64901':
configure: Drop duplicate pkg-config entry from help output
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -274,7 +274,6 @@ Toolchain options: --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] @@ -284,7 +283,7 @@ Toolchain options: --cxx=CXX use C compiler CXX [$cxx_default] --dep-cc=DEPCC use dependency generator DEPCC [$cc_default] --ld=LD use linker LD [$ld_default] - --pkg-config=PKGCONF use pkg-config PKGCONF [$pkg_config_default] + --pkg-config=PKGCONFIG use pkg-config tool PKGCONFIG [$pkg_config_default] --pkg-config-flags=FLAGS pass additional flags to pkgconf [] --ranlib=RANLIB use ranlib RANLIB [$ranlib_default] --host-cc=HOSTCC use host C compiler HOSTCC |
