summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-11 17:24:18 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2007-10-11 17:24:18 +0100
commite54d56b7b22dfc4a6eccb4e75e6d76e168fe90a0 (patch)
treeac9878336b8324a5d5994ed9a24642343418c679
parentd229e579a314c6b893e0a92730f0bf644b4eabcd (diff)
parent902beb7c2cba193a7e6292d35eadffb0aae87623 (diff)
Merge branch 'inline'
-rw-r--r--ChangeLog2
-rw-r--r--configure.in1
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2f52bc41..1a53881e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2007-10-11 Simon McVittie <simon.mcvittie@collabora.co.uk>
+ * configure.in: enable Autoconf's AC_C_INLINE to avoid compilation
+ failure with gcc -ansi
* dbus/dbus-macros.h, dbus/dbus-arch-deps.h.in: Use new macro
_DBUS_GNUC_EXTENSION (the same as G_GNUC_EXTENSION) to avoid -ansi
warnings about use of "long long".
diff --git a/configure.in b/configure.in
index c9331158..f5d4edc2 100644
--- a/configure.in
+++ b/configure.in
@@ -59,6 +59,7 @@ AM_PROG_CC_C_O
AC_PROG_CXX
AC_ISC_POSIX
AC_HEADER_STDC
+AC_C_INLINE
AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no)