diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-15 18:15:21 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-03-15 18:15:25 +0000 |
| commit | e77e5c7c6982e7b0ec167a812d5eae5082193a52 (patch) | |
| tree | 90d48b1c26938fd67fe82fa784f47701fa0f90a7 /m4 | |
| parent | 64a19c7d218db2429b49b578e267c24871657774 (diff) | |
| parent | 6418d8a197b080e116ba209ea8733263e3a4ef24 (diff) | |
| download | telepathy-glib-e77e5c7c6982e7b0ec167a812d5eae5082193a52.tar.gz | |
Merge branch 'ldflags'
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=32976
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/tp-compiler-flag.m4 | 7 | ||||
| -rw-r--r-- | m4/tp-linker-flag.m4 | 44 |
2 files changed, 51 insertions, 0 deletions
diff --git a/m4/tp-compiler-flag.m4 b/m4/tp-compiler-flag.m4 index fc05e9e17..06deaba05 100644 --- a/m4/tp-compiler-flag.m4 +++ b/m4/tp-compiler-flag.m4 @@ -34,3 +34,10 @@ AC_DEFUN([TP_COMPILER_FLAG], fi AC_MSG_RESULT([$flag_ok]) ]) + +dnl TP_ADD_COMPILER_FLAG(VARIABLE, CFLAGS) +dnl Append CFLAGS to VARIABLE if the compiler supports them. +AC_DEFUN([TP_ADD_COMPILER_FLAG], +[ + TP_COMPILER_FLAG([$2], [$1="[$]$1 $2"]) +]) diff --git a/m4/tp-linker-flag.m4 b/m4/tp-linker-flag.m4 new file mode 100644 index 000000000..23eb41ad9 --- /dev/null +++ b/m4/tp-linker-flag.m4 @@ -0,0 +1,44 @@ +dnl A version of AS_COMPILER_FLAG that supports linker flags +dnl Based on: + +dnl as-compiler-flag.m4 0.1.0 +dnl autostars m4 macro for detection of compiler flags +dnl David Schleef <ds@schleef.org> +dnl $Id: as-compiler-flag.m4,v 1.1 2005/06/18 18:02:46 burgerman Exp $ + +dnl TP_LINKER_FLAG(LDFLAGS, ACTION-IF-ACCEPTED, [ACTION-IF-NOT-ACCEPTED]) +dnl Tries to compile with the given LDFLAGS. +dnl +dnl Runs ACTION-IF-ACCEPTED if the compiler/linker for the currently selected +dnl AC_LANG can compile with the flags, and ACTION-IF-NOT-ACCEPTED otherwise. +dnl +dnl Note that LDFLAGS are passed to the linker via the compiler, so you +dnl should check for -Wl,--no-add-needed rather than --no-add-needed. + +AC_DEFUN([TP_LINKER_FLAG], +[ + AC_MSG_CHECKING([to see if compiler/linker understand $1]) + + save_LDFLAGS="$LDFLAGS" + LDFLAGS="$LDFLAGS $1" + + AC_COMPILE_IFELSE(AC_LANG_PROGRAM([], []), [flag_ok=yes], [flag_ok=no]) + + LDFLAGS="$save_LDFLAGS" + + if test "X$flag_ok" = Xyes ; then + $2 + true + else + $3 + true + fi + AC_MSG_RESULT([$flag_ok]) +]) + +dnl TP_ADD_LINKER_FLAG(VARIABLE, LDFLAGS) +dnl Append LDFLAGS to VARIABLE if the linker supports them. +AC_DEFUN([TP_ADD_LINKER_FLAG], +[ + TP_LINKER_FLAG([$2], [$1="[$]$1 $2"]) +]) |