diff options
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/faad.m4 | 12 | ||||
| -rw-r--r-- | m4/mpd_check_cflag.m4 | 4 | ||||
| -rw-r--r-- | m4/pretty_print.m4 | 12 |
3 files changed, 14 insertions, 14 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" ]) diff --git a/m4/pretty_print.m4 b/m4/pretty_print.m4 index a22357a8d..687dceefe 100644 --- a/m4/pretty_print.m4 +++ b/m4/pretty_print.m4 @@ -1,19 +1,19 @@ AC_DEFUN([results], [ dnl This is a hack to allow "with" names, otherwise "enable". - num=`expr match $1 'with'` + num=`expr $1 : 'with'` if test "$num" != "0"; then var="`echo '$'$1`" else var="`echo '$'enable_$1`" fi - echo -n '(' + printf '(' if eval "test x$var = xyes"; then - echo -n '+' + printf '+' elif test -n "$3" && eval "test x$var = x$3"; then - echo -n '+' + printf '+' else - echo -n '-' + printf '-' fi - echo -n "$2) " + printf '%s) ' "$2" ]) |