[GNUnet-SVN] r37776 - libmicrohttpd

[gnunet]

Author: Karlson2k
Date: 2016-08-24 13:37:46 +0200 (Wed, 24 Aug 2016)
New Revision: 37776

Modified:
   libmicrohttpd/configure.ac
Log:
configure.ac: improved compiler "inline" keyword detection

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2016-08-24 10:30:57 UTC (rev 37775)
+++ libmicrohttpd/configure.ac  2016-08-24 11:37:46 UTC (rev 37776)
@@ -100,13 +100,23 @@
       ]])
   ])
 
+AX_CHECK_COMPILE_FLAG([[-Werror=attributes]], 
+                      [[errattr_CFLAGS="-Werror=attributes"]],
+                      [[errattr_CFLAGS=""]], [], [])
 AC_MSG_CHECKING([[for function inline keywords suppoted by $CC]])
 save_CFLAGS="$CFLAGS"
-AX_APPEND_FLAG([[-Werror=attributes]])
+CFLAGS="$CFLAGS $errattr_CFLAGS"
 inln_prfx="none"
 # Prefer always inline functions
-for inln_prfx_chk in "inline __attribute__((always_inline))" __forceinline 
inline __inline__ __inline _inline _Inline; do
+for inln_prfx_chk in InlineWithAttr __forceinline inline __inline__ __inline 
_inline _Inline; do
   # Try to link to avoid "symbol undefined" problems at build time
+  AS_IF([[test "x$inln_prfx_chk" = "xInlineWithAttr"]],
+    [
+     AS_IF([[test "x$errattr_CFLAGS" = "x"]],
+       [[ # Skip test with attribute as negative result can't be detected
+          inln_prfx_chk="__forceinline" # use next value
+       ]],[[inln_prfx_chk="inline __attribute__((always_inline))"]])
+    ])
   AC_LINK_IFELSE(
     [
      AC_LANG_PROGRAM(