forked from pool/audacity
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
--- a/m4/audacity_checklib_libflac.m4
|
|
+++ b/m4/audacity_checklib_libflac.m4
|
|
@@ -13,21 +13,21 @@ AC_DEFUN([AUDACITY_CHECKLIB_LIBFLAC], [
|
|
|
|
dnl See if FLAC is installed in the system
|
|
|
|
- PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0],
|
|
+ PKG_CHECK_MODULES([FLAC], [flac >= 1.5.0 flac++ >= 1.5.0],
|
|
[LIBFLAC_SYSTEM_AVAILABLE="yes"],
|
|
[LIBFLAC_SYSTEM_AVAILABLE="no"])
|
|
|
|
- dnl Check for flac < 1.3.0
|
|
+ dnl Check for flac < 1.5.0
|
|
if test "$LIBFLAC_SYSTEM_AVAILABLE" = "no"; then
|
|
PKG_CHECK_MODULES([FLAC], [flac flac++],
|
|
[LIBFLAC_SYSTEM_AVAILABLE="yes"],
|
|
[LIBFLAC_SYSTEM_AVAILABLE="no"])
|
|
- dnl flac < 1.3.0 adds its own FLAC and FLAC++ subdirectories to the search
|
|
+ dnl flac < 1.5.0 adds its own FLAC and FLAC++ subdirectories to the search
|
|
dnl path and ships a assert.h file there. This assert.h overwrites the
|
|
dnl assert.h header from the C standard library. We need to strip /FLAC
|
|
dnl and /FLAC++ from the include paths to make the assert.h from the C
|
|
dnl standard library available again.
|
|
- [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's@-I\([^ ]*\)/FLAC\(++\)\? @-I\1 @g')]
|
|
+ [FLAC_CFLAGS=$(echo "$FLAC_CFLAGS" | sed 's|-I\([^ ]*\)/FLAC\(++\)\?[ ]*|-I\1 |g')]
|
|
fi
|
|
|
|
if test "$LIBFLAC_SYSTEM_AVAILABLE" = "yes"; then
|