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.
This commit is contained in:
Jan Schmidt 2007-07-13 13:49:14 +00:00
parent 0e4bd38e13
commit dd064a2a2d
2 changed files with 22 additions and 4 deletions

View file

@ -1,3 +1,10 @@
2007-07-13 Jan Schmidt <thaytan@mad.scientist.com>
* 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 <ensonic@users.sf.net> 2007-07-12 Stefan Kost <ensonic@users.sf.net>
* configure.ac: * configure.ac:

View file

@ -417,10 +417,21 @@ fi
AC_SUBST(GST_DISABLE_XML_DEFINE) AC_SUBST(GST_DISABLE_XML_DEFINE)
dnl check for "check", unit testing library/header dnl check for "check", unit testing library/header
PKG_CHECK_MODULES(CHECK, check >= 0.9.2, AM_PATH_CHECK(0.9.2,
AM_CONDITIONAL(HAVE_CHECK, true), [
AM_CONDITIONAL(HAVE_CHECK, false) 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 dnl *** set variables based on configure arguments