build: Respect CFLAGS and LIBS env settings

The build system does not honor the flags set externally and replaces
it with the pthread-only flags when detecting pthread
availability. This breaks the configuration of cairo in some
cross-compilation environments:

conftest.c:1: note: someone does not honour COPTS correctly, passed 0 times

The test for pthread should append the new flags to the old one.
This commit is contained in:
Andrea Canciani 2011-07-29 19:12:55 +02:00
parent b2ee7d9a21
commit d2ea8bd070

View file

@ -135,11 +135,11 @@ dnl <program> with the given flags and libs. Execute <true-action> on
dnl success and <false-action> on failure.
AC_DEFUN([CAIRO_CHECK_PTHREAD],[dnl
CAIRO_CC_TRY_LINK_WITH_ENV_SILENT(
[CFLAGS="$2";
LIBS="$3"],
[CFLAGS="$CFLAGS $2";
LIBS="$LIBS $3"],
[$4],
[$1_CFLAGS="$CFLAGS";
$1_LIBS="$LIBS";
[$1_CFLAGS="$2";
$1_LIBS="$3";
$5],
[$1_CFLAGS="";
$1_LIBS="";