2015-04-07 14:37:08 +02:00
|
|
|
diff -aur a/m4/audacity_checklib_libflac.m4 b/m4/audacity_checklib_libflac.m4
|
|
|
|
--- a/m4/audacity_checklib_libflac.m4
|
|
|
|
+++ b/m4/audacity_checklib_libflac.m4
|
2014-10-27 17:01:44 +01:00
|
|
|
@@ -13,16 +13,16 @@
|
|
|
|
|
|
|
|
dnl See if FLAC is installed in the system
|
|
|
|
|
|
|
|
- PKG_CHECK_MODULES([FLAC], [flac >= 1.3.0 flac++ >= 1.3.0],
|
2015-04-07 14:37:08 +02:00
|
|
|
+ PKG_CHECK_MODULES([FLAC], [flac >= 1.4.0 flac++ >= 1.4.0],
|
2014-10-27 17:01:44 +01:00
|
|
|
[LIBFLAC_SYSTEM_AVAILABLE="yes"],
|
|
|
|
[LIBFLAC_SYSTEM_AVAILABLE="no"])
|
|
|
|
|
|
|
|
- dnl Check for flac < 1.3.0
|
2015-04-07 14:37:08 +02:00
|
|
|
+ dnl Check for flac < 1.4.0
|
2014-10-27 17:01:44 +01:00
|
|
|
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
|
2015-04-07 14:37:08 +02:00
|
|
|
+ dnl flac < 1.4.0 adds its own FLAC and FLAC++ subdirectories to the search
|
2014-10-27 17:01:44 +01:00
|
|
|
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
|