From 25ea6395707360f7902d0eaf1c5b701a81bd0359 Mon Sep 17 00:00:00 2001
From: Jeroen Ooms <jeroenooms@gmail.com>
Date: Fri, 31 Jan 2020 12:11:02 +0100
Subject: [PATCH] Fix for CRAN

---
 DESCRIPTION | 2 +-
 NEWS        | 3 +++
 configure   | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index a8f6807..6122bb6 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RAppArmor
 Type: Package
 Title: Bindings to AppArmor and Security Related Linux Tools
-Version: 3.2
+Version: 3.2.1
 Authors@R: person("Jeroen", "Ooms", role = c("aut", "cre"), 
     email = "jeroen@berkeley.edu", comment = c(ORCID = "0000-0002-4035-0289"))
 Description: Bindings to kernel methods for enforcing security restrictions. 
diff --git a/NEWS b/NEWS
index 35aef9c..f0af71a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+3.2.1
+ - Fix for CRAN: do not use CPP in configure
+
 3.2
  - Move unix from Imports to Depends because many old examples from the paper
    assume that the rlimit_ functions are attached when using RAppArmor.
diff --git a/configure b/configure
index 9600ac9..aba39d6 100755
--- a/configure
+++ b/configure
@@ -32,12 +32,12 @@ echo "Using PKG_CFLAGS=$PKG_CFLAGS"
 echo "Using PKG_LIBS=$PKG_LIBS"
 
 # Find compiler
-CPP=$(${R_HOME}/bin/R CMD config CPP)
+CC=$(${R_HOME}/bin/R CMD config CC)
 CFLAGS=$(${R_HOME}/bin/R CMD config CFLAGS)
 CPPFLAGS=$(${R_HOME}/bin/R CMD config CPPFLAGS)
 
 # Test for header
-echo "#include $PKG_TEST_HEADER" | ${CPP} ${CPPFLAGS} ${PKG_CFLAGS} ${CFLAGS} -xc - >/dev/null 2>&1
+echo "#include $PKG_TEST_HEADER" | ${CC} -E ${CPPFLAGS} ${PKG_CFLAGS} ${CFLAGS} -xc - >/dev/null 2>&1
 
 # Customize the error
 if [ $? -ne 0 ]; then