Include system wide CFLAGS when building

2 files changed, 7 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee53ad4..c019696 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,6 @@ OPTION(SHOW_SECRETS "Show passwords as clear text in logs." OFF)
 OPTION(SQLITE3 "Build database driver for SQLite3" OFF)
 OPTION(EUREPHIADM "Build command line based admin utility" OFF)
 OPTION(PLUGIN "Build the eurephia plugin for OpenVPN" OFF)
-OPTION(GCOV "Build eurephia with gcov features enabled" OFF)
 OPTION(DOXYGEN "Compile Doxygen documentation" OFF)
 
 # eurephia parameters - string values
@@ -43,10 +42,7 @@ SET(XSLTROOT "/usr/local/share/eurephia/xslt" CACHE STRING "Root path for the XS
 SET(CMAKE_INSTALL_PREFIX ${PREFIX})
 
 # Default C compiler flags
-SET(CMAKE_C_FLAGS "-fno-delete-null-pointer-checks -g -Wall -Wpointer-arith")
-IF(GCOV)
-        SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-ENDIF(GCOV)
+SET(CMAKE_C_FLAGS "${CFLAGS}")
 
 # Needed cmake modules
 INCLUDE(CheckIncludeFile)
diff --git a/configure b/configure
index ed1f5de..33fbd0b 100755
--- a/configure
+++ b/configure
@@ -87,7 +87,7 @@ ADMIN="";
 OPENVPN_SRC_DIR=""
 PLUGIN=""
 CONFIGUREPARAMS="$*"
-GCOV=""
+CFLAGS="$CFLAGS -fno-delete-null-pointer-checks -g -Wall -Wpointer-arith"
 
 # Parse all arguments
 while [ ! -z "$1" ]; do
@@ -137,8 +137,7 @@ while [ ! -z "$1" ]; do
               SECRETS_WARN=1
               ;;
           --gcov)
-              PARAMS="${PARAMS} -DGCOV=ON"
-              GCOV=1
+              CFLAGS="${CFLAGS} -fprofile-arcs -ftest-coverage"
               ;;
           -p|--plug-in)
               PARAMS="${PARAMS} -DPLUGIN=ON"
@@ -235,12 +234,15 @@ rm -f CMakeCache.txt
 EOF
     cmake . ${PARAMS} -DPREFIX:STRING=${PREFIX} -DCMAKE_INSTALL_PREFIX:STRING=${PREFIX} \
         -DPLUGINDIR:STRING=${PLUGINDIR} -DBINDIR:STRING=${BINDIR} \
-        -DEUREPHIADM_XSLT_PATH:STRING=${EUREPHIADM_XSLT} -DXSLTROOT:STRING=${XSLTPATH}
+        -DEUREPHIADM_XSLT_PATH:STRING=${EUREPHIADM_XSLT} -DXSLTROOT:STRING=${XSLTPATH} \
+        -DCFLAGS:STRING="${CFLAGS}"
     export ec=$?
 
     # If cmake exited without failure, provide some info about the configuration
     if [ "$ec" = "0" ]; then
         echo
+        echo "Building options:"
+        echo "                 CFLAGS: $CFLAGS"
         echo
         echo "eurephia will be built with support for: "
         echo