Merge pull request #6069 from orbea/revert-6064-builtin-flac

Revert "Fix building with built-in flac"
This commit is contained in:
Twinaphex 2018-01-08 19:21:51 +01:00 committed by GitHub
commit 9f804f40bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -273,13 +273,11 @@ fi
if [ "$HAVE_FLAC" = 'no' ]; then
HAVE_BUILTINFLAC=no
elif [ "$HAVE_BUILTINFLAC" = 'yes' ]; then
HAVE_FLAC=yes
else
check_pkgconf FLAC flac
check_val '' FLAC '-lFLAC'
fi
check_pkgconf FLAC flac
check_val '' FLAC '-lFLAC'
check_pkgconf LIBUSB libusb-1.0 1.0.13
check_val '' LIBUSB -lusb-1.0 libusb-1.0