diff options
| author | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-01-07 23:50:23 +0100 |
| commit | 8c0afd8557b1823e2df94c9f4de90c29eafbf035 (patch) | |
| tree | ec4d9131c4e1cb5e1a832e4b70712884f2406a81 /m4 | |
| parent | 2a56300f7bad00860f5ff44dfea061386173a852 (diff) | |
| parent | 0022fb100b7d22b9612474ebee944e66c2a7b33b (diff) | |
| download | mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.gz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.tar.xz mpd-8c0afd8557b1823e2df94c9f4de90c29eafbf035.zip | |
Merge branch 'v0.15.x' into v0.16.x
Conflicts:
NEWS
configure.ac
src/directory.h
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/faad.m4 | 12 | ||||
| -rw-r--r-- | m4/mpd_check_cflag.m4 | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/m4/faad.m4 b/m4/faad.m4 index f6447b0fb..007787557 100644 --- a/m4/faad.m4 +++ b/m4/faad.m4 @@ -58,7 +58,7 @@ if test x$enable_aac = xyes; then fi if test x$enable_aac = xyes; then AC_MSG_CHECKING(that FAAD2 uses buffer and bufferlen) - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <faad.h> int main() { @@ -82,9 +82,9 @@ int main() { return 0; } -],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no); +])],[AC_MSG_RESULT(yes);AC_DEFINE(HAVE_FAAD_BUFLEN_FUNCS,1,[Define if FAAD2 uses buflen in function calls])],[AC_MSG_RESULT(no); AC_MSG_CHECKING(that FAAD2 can even be used) - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <faad.h> int main() { @@ -113,7 +113,7 @@ int main() { return 0; } -],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no]) +])],AC_MSG_RESULT(yes),[AC_MSG_RESULT(no);enable_aac=no]) ]) fi if test x$enable_aac = xyes; then @@ -136,7 +136,7 @@ if test x$enable_aac = xyes; then CPPFLAGS=$CFLAGS AC_MSG_CHECKING(for broken libfaad headers) - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ #include <faad.h> #include <stddef.h> #include <stdint.h> @@ -148,7 +148,7 @@ int main() { faacDecInit2(NULL, NULL, 0, &sample_rate, &channels); return 0; } - ], + ])], [AC_MSG_RESULT(correct)], [AC_MSG_RESULT(broken); AC_DEFINE(HAVE_FAAD_LONG, 1, [Define if faad.h uses the broken "unsigned long" pointers])]) diff --git a/m4/mpd_check_cflag.m4 b/m4/mpd_check_cflag.m4 index 9b5788f7b..8e7144936 100644 --- a/m4/mpd_check_cflag.m4 +++ b/m4/mpd_check_cflag.m4 @@ -4,9 +4,9 @@ AC_DEFUN([MPD_CHECK_FLAG],[ [mpd_check_cflag_$var],[ save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $1" - AC_COMPILE_IFELSE([ + AC_COMPILE_IFELSE([AC_LANG_SOURCE([ int main(void) { return 0; } - ], [ eval "mpd_check_cflag_$var=yes" + ])], [ eval "mpd_check_cflag_$var=yes" ], [ eval "mpd_check_cflag_$var=no" ]) CFLAGS="$save_CFLAGS" ]) |