From dd064a2a2d34bb7fc9820941205201610816bc13 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 13 Jul 2007 13:49:14 +0000 Subject: [PATCH] configure.ac: Revert the pkg-config check for libcheck, since it pulls in the wrong non-PIC libcheck.a on Ubuntu and ... Original commit message from CVS: * configure.ac: Revert the pkg-config check for libcheck, since it pulls in the wrong non-PIC libcheck.a on Ubuntu and probably Fedora too. We need a proper solution, either from the check project, or something else. --- ChangeLog | 7 +++++++ configure.ac | 19 +++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4292095..0f1b20c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-13 Jan Schmidt + + * configure.ac: + Revert the pkg-config check for libcheck, since it pulls in the + wrong non-PIC libcheck.a on Ubuntu and probably Fedora too. We need + a proper solution, either from the check project, or something else. + 2007-07-12 Stefan Kost * configure.ac: diff --git a/configure.ac b/configure.ac index 8dc66bd..bc8fd34 100644 --- a/configure.ac +++ b/configure.ac @@ -417,10 +417,21 @@ fi AC_SUBST(GST_DISABLE_XML_DEFINE) dnl check for "check", unit testing library/header -PKG_CHECK_MODULES(CHECK, check >= 0.9.2, - AM_CONDITIONAL(HAVE_CHECK, true), - AM_CONDITIONAL(HAVE_CHECK, false) -) +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) +AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes") + +dnl pkg-config check that for libcheck that works for cross-compiling +dnl but not normal compilation on Fedora & Ubuntu: +dnl PKG_CHECK_MODULES(CHECK, check >= 0.9.2, +dnl AM_CONDITIONAL(HAVE_CHECK, true), +dnl AM_CONDITIONAL(HAVE_CHECK, false) +dnl ) dnl *** set variables based on configure arguments -- 2.7.4