From 678b4e9cad47a6c176bb05de32aa0dd56742f15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Mon, 14 Nov 2005 12:34:45 +0000 Subject: *BUGFIX* Testsuite for M$ Windows: - init mutex in all video drivers ('none' for testsuite, fixes crashes), was OK for linux pthreads - use WaitForSingleObject for console file descriptirs in _x_io_select (fixes stdin:/) - workaround heavy debug messages in asf demuxer for some samples (fixes full disk :->) Fixed previous fix, s/gmtime/timgm/ :-) Aalib cross detection + udate docs CVS patchset: 7799 CVS date: 2005/11/14 12:34:45 --- m4/aa.m4 | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) (limited to 'm4') diff --git a/m4/aa.m4 b/m4/aa.m4 index b3bd43c6e..2dc0021fa 100644 --- a/m4/aa.m4 +++ b/m4/aa.m4 @@ -176,13 +176,22 @@ int main () { } return 1; } -],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - +],, no_aalib=yes, + AC_TRY_LINK([ +#include +#include +], [ return ((AA_LIB_VERSION) || +#ifdef AA_LIB_MINNOR + (AA_LIB_MINNOR) +#else + (AA_LIB_MINOR) +#endif + ); ],, no_aalib=yes)) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" fi - else + else dnl AALIB_CONFIG AC_MSG_CHECKING([for AALIB version >= $min_aalib_version]) no_aalib="" AALIB_CFLAGS=`$AALIB_CONFIG $aalib_config_args --cflags` @@ -246,11 +255,21 @@ printf("\n*** An old version of AALIB (%d.%d) was found.\n", AA_LIB_VERSION, AA_ } return 1; } -],, no_aalib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) +],, no_aalib=yes, + AC_TRY_LINK([ +#include +#include +], [ return ((AA_LIB_VERSION) || +#ifdef AA_LIB_MINNOR + (AA_LIB_MINNOR) +#else + (AA_LIB_MINOR) +#endif + ); ],, no_aalib=yes)) CFLAGS="$ac_save_CFLAGS" LIBS="$ac_save_LIBS" - fi - fi dnl AALIB_CONFIG + fi dnl AALIB_CONFIG + fi dnl enable_aalibtest if test "x$no_aalib" = x; then AC_MSG_RESULT(yes) -- cgit v1.2.3