Add cmake support for HAVE_GNUC_VARARGS and HAVE_ISO_VARARGS

Reviewed-by: Simon McVittie <smcv@collabora.com>
Bug: https://gitlab.freedesktop.org/dbus/dbus/merge_requests/18

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index c14421ff6da9ecc58c85a5dc0c150501045c7e41..88331d7d64b3e822bbb2e263ae802955b831e38b 100644 (file)
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -175,6 +175,28 @@ if(NOT HAVE_DIRFD)
     " HAVE_DDFD)
 endif()
 
+CHECK_C_SOURCE_COMPILES("
+int a(int p1, int p2, int p3)
+{
+}
+int main()
+{
+    #define call_a(params...) a(1,params)
+    call_a(2,3);
+}
+" HAVE_GNUC_VARARGS)
+
+CHECK_C_SOURCE_COMPILES("
+int a(int p1, int p2, int p3)
+{
+}
+int main()
+{
+    #define call_a(...) a(1,__VA_ARGS__)
+    call_a(2,3);
+}
+" HAVE_ISO_VARARGS)
+
 # missing:
 # DBUS_HAVE_GCC33_GCOV
 

diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index f46454aaef116b870aba655615b7d0f2f5030b64..af19a8050e148a96201fe679eb06939f9f7d013e 100644 (file)
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -12,8 +12,13 @@
  * Variables defined by AC_DEFINE in ../configure.ac
  * should be placed in this file
 */
+
+/* Have GNU-style varargs macros */
 #cmakedefine HAVE_GNUC_VARARGS 1
 
+/* Have ISO C99 varargs macros */
+#cmakedefine HAVE_ISO_VARARGS 1
+
 #cmakedefine DBUS_CONSOLE_AUTH_DIR "@DBUS_CONSOLE_AUTH_DIR@"
 #cmakedefine DBUS_DATADIR  "@DBUS_DATADIR@"
 #cmakedefine DBUS_BINDIR   "@DBUS_BINDIR@"