diff options
| author | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2010-06-27 01:14:03 +0300 |
|---|---|---|
| committer | M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> | 2010-07-11 21:40:26 +0300 |
| commit | 47c35e5e86a3c99fc39afe2e13a7c92d5247ee1e (patch) | |
| tree | a439bf319a252f425dbd58d182bb6f4cb1ecb51a /build | |
| parent | d2f5592e0e0d316cfc40ec676ee6e7f4e2a699fb (diff) | |
build: Purge CAIRO_CC_TRY_LINK_FLAG.
Use CAIRO_CC_TRY_FLAG instead in the one place where we used
CAIRO_CC_TRY_LINK_FLAG and make the build system one macro
smaller.
Diffstat (limited to 'build')
| -rw-r--r-- | build/aclocal.cairo.m4 | 21 | ||||
| -rw-r--r-- | build/configure.ac.warnings | 2 |
2 files changed, 1 insertions, 22 deletions
diff --git a/build/aclocal.cairo.m4 b/build/aclocal.cairo.m4 index 0b686775..592e168c 100644 --- a/build/aclocal.cairo.m4 +++ b/build/aclocal.cairo.m4 @@ -153,27 +153,6 @@ AC_DEFUN([CAIRO_CC_TRY_FLAG], AC_MSG_RESULT([$cairo_cc_flag]) ]) -dnl check compiler/ld flags -AC_DEFUN([CAIRO_CC_TRY_LINK_FLAG], -[dnl - CAIRO_CC_CHECK_WERROR - AC_MSG_CHECKING([whether $CC supports $1]) - - _save_cflags="$CFLAGS" - CFLAGS="$CFLAGS $WERROR $1" - AC_LINK_IFELSE([int main(void){ return 0;} ], - [cairo_cc_flag=yes], - [cairo_cc_flag=no]) - CFLAGS="$_save_cflags" - - if test "x$cairo_cc_flag" = "xyes"; then - ifelse([$2], , :, [$2]) - else - ifelse([$3], , :, [$3]) - fi - AC_MSG_RESULT([$cairo_cc_flag]) -]) - dnl Usage: dnl CAIRO_CHECK_NATIVE_ATOMIC_PRIMITIVES AC_DEFUN([CAIRO_CHECK_NATIVE_ATOMIC_PRIMITIVES], diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings index 2f5745ff..b225ac82 100644 --- a/build/configure.ac.warnings +++ b/build/configure.ac.warnings @@ -81,7 +81,7 @@ AC_DEFINE_UNQUOTED([WARN_UNUSED_RESULT], [$cairo_cv_warn_unused_result], dnl check linker flags AC_CACHE_CHECK([how to allow undefined symbols in shared libraries used by test suite], cairo_cv_test_undefined_ldflags, - [CAIRO_CC_TRY_LINK_FLAG([-Wl,--allow-shlib-undefined], + [CAIRO_CC_TRY_FLAG([-Wl,--allow-shlib-undefined], [], [cairo_cv_test_undefined_ldflags="-Wl,--allow-shlib-undefined]")]) CAIRO_TEST_UNDEFINED_LDFLAGS="$cairo_cv_test_undefined_ldflags" AC_SUBST(CAIRO_TEST_UNDEFINED_LDFLAGS) |