From 40d2055451e18c96960a08e3cb824ea72e55379b Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 15 Sep 2008 15:18:07 +0000 Subject: [PATCH] configure.ac: Do not probe availability of check unit test library when cross compiling, as test would not work anywa... Original commit message from CVS: * configure.ac: Do not probe availability of check unit test library when cross compiling, as test would not work anyway. Also cleanup verbose output of the check test. Fixes #551952. --- ChangeLog | 7 +++++++ configure.ac | 14 +++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0e567c87a0..40d9cb7a56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-09-15 Stefan Kost + + * configure.ac: + Do not probe availability of check unit test library when cross + compiling, as test would not work anyway. Also cleanup verbose output + of the check test. Fixes #551952. + 2008-09-14 Wim Taymans Based on patch by: Antoine Tremblay diff --git a/configure.ac b/configure.ac index 11aed2ec89..cbb4342d20 100644 --- a/configure.ac +++ b/configure.ac @@ -498,13 +498,13 @@ fi AC_SUBST(GST_DISABLE_XML_DEFINE) dnl check for "check", unit testing library/header -AM_PATH_CHECK(0.9.2, - [ - HAVE_CHECK=yes - AC_MSG_NOTICE(CHECK_CFLAGS: $CHECK_CFLAGS) - AC_MSG_NOTICE(CHECK_LIBS: $CHECK_LIBS) - ], - HAVE_CHECK=no) +if test "$cross_compiling" != yes; then + AM_PATH_CHECK(0.9.2, + HAVE_CHECK=yes, + HAVE_CHECK=no) +else + HAVE_CHECK=no +fi AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") dnl pkg-config check that for libcheck that works for cross-compiling