diff options
| author | Andrea Canciani <ranma42@gmail.com> | 2011-07-29 19:12:55 +0200 |
|---|---|---|
| committer | Andrea Canciani <ranma42@gmail.com> | 2011-07-29 19:29:53 +0200 |
| commit | d2ea8bd070f3bff87ec952af490093375cbc1f05 (patch) | |
| tree | 742c88e7677e0a513df451b1826c044c42b85dba /build | |
| parent | b2ee7d9a21df56bf68851930448bc91f49a93e3d (diff) | |
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.
Diffstat (limited to 'build')
| -rw-r--r-- | build/configure.ac.pthread | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/configure.ac.pthread b/build/configure.ac.pthread index 52033619..29c930da 100644 --- a/build/configure.ac.pthread +++ b/build/configure.ac.pthread @@ -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=""; |