summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt11
-rw-r--r--configure.ac6
2 files changed, 14 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index bef5262..3be7535 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,17 @@ include(CheckSymbolExists)
include(CheckLibraryExists)
include(CMakePushCheckState)
include(GNUInstallDirs)
+include(CheckCCompilerFlag)
+
+CHECK_C_COMPILER_FLAG("-std=gnu90" HAVE_GNU90)
+if (HAVE_GNU90)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90")
+else()
+ CHECK_C_COMPILER_FLAG("-std=c90" HAVE_C90)
+ if (HAVE_C90)
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c90")
+ endif()
+endif()
# Detect if we need to link against a socket library:
cmake_push_check_state()
diff --git a/configure.ac b/configure.ac
index 0029533..3b34d9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,10 +30,10 @@ LT_PREREQ([2.2])
LT_INIT([disable-static win32-dll])
# Program checks
-m4_ifdef([AC_PROG_CC_C99], [AC_PROG_CC_C99],
- [AC_MSG_WARN([Attempt c99 workaround for old versions of autoconf])
+m4_ifdef([AC_PROG_CC_89], [AC_PROG_CC_89],
+ [AC_MSG_WARN([Attempt c89 workaround for old versions of autoconf])
AC_PROG_CC
- AX_TRY_CFLAGS([-std=c99], [AX_CFLAGS([-std=c99])])])
+ AX_TRY_CFLAGS([-std=gnu90], [AX_CFLAGS([-std=gnu90])])])
PKG_PROG_PKG_CONFIG([0.17])
# Environment setup