diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 16:12:16 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 16:13:23 -0300 |
| commit | 1a4315f24d2c5857ebeb379fe39f0124746ee30a (patch) | |
| tree | a4d7c7d51cad0a9bb63b4a72121cfa8111dc303d /configure | |
| parent | 869401cefc22e221edbf135bacaa1f21014fd001 (diff) | |
| parent | 8e97a8c69162afce47abea96c8c0914f3550e212 (diff) | |
Merge commit '8e97a8c69162afce47abea96c8c0914f3550e212'
* commit '8e97a8c69162afce47abea96c8c0914f3550e212':
build: Remove check for gsm/gsm.h for libgsm
Also includes fix from 010baac12a14d684a1ae72f6b7509e642c40f3b3
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -1926,7 +1926,6 @@ HEADERS_LIST=" dxgidebug_h dxva_h ES2_gl_h - gsm_h io_h mach_mach_time_h machine_ioctl_bt848_h @@ -5937,9 +5936,7 @@ enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build. enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } -enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do - check_lib libgsm "${gsm_hdr}" gsm_create -lgsm && break; - done || die "ERROR: libgsm not found"; } +enabled libgsm && require libgsm gsm.h gsm_create -lgsm enabled libilbc && require libilbc ilbc.h WebRtcIlbcfix_InitDecode -lilbc $pthreads_extralibs enabled libkvazaar && require_pkg_config libkvazaar "kvazaar >= 0.8.1" kvazaar.h kvz_api_get # While it may appear that require is being used as a pkg-config |