From 161aa5c139cca9b4d9cc8bb593c56426008091d9 Mon Sep 17 00:00:00 2001
From: Geronimo Orozco <geronimo.orozco@intel.com>
Date: Tue, 16 May 2017 14:10:27 -0500
Subject: [PATCH] configure: Remove AX_VALGRIND_DFLT references

AX_VALGRIND_DFLT makes it imposible to build cc-oci-runtime in older
distros. Hence we need to disable this checks in order to build
successfuly on Ubuntu 16.04, Ubuntu 16.10 and Fedora 24.

Added --disable-valgrind-sgcheck to default build options

Fixes #888 and #887

Signed-off-by: Geronimo Orozco <geronimo.orozco@intel.com>
---
 .ci/ci-configure.sh | 1 +
 Makefile.am         | 1 +
 autogen.sh          | 3 ++-
 configure.ac        | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.ci/ci-configure.sh b/.ci/ci-configure.sh
index 75f95dcb..beb679bf 100755
--- a/.ci/ci-configure.sh
+++ b/.ci/ci-configure.sh
@@ -57,6 +57,7 @@ configure_opts+=" --enable-valgrind"
 configure_opts+=" --disable-valgrind-helgrind"
 configure_opts+=" --disable-valgrind-drd"
 configure_opts+=" --disable-silent-rules"
+configure_opts+=" --disable-valgrind-sgcheck"
 
 if [ "$nested" = "Y" ]
 then
diff --git a/Makefile.am b/Makefile.am
index d34d44e6..bbec0a61 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -156,6 +156,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--enable-valgrind \
 	--disable-valgrind-helgrind \
 	--disable-valgrind-drd \
+	--disable-valgrind-sgcheck \
 	--enable-code-coverage \
 	--enable-functional-tests \
 	--with-systemdsystemunitdir=/tmp/cc-distcheck/systemdunitdir/
diff --git a/autogen.sh b/autogen.sh
index 183bf7c1..7b39a011 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,8 @@ autoreconf --force --install --symlink --warnings=all
 args="\
 --sysconfdir=/etc \
 --localstatedir=/var \
---prefix=/usr"
+--prefix=/usr \
+--disable-valgrind-sgcheck"
 
 set -x
 ./configure $args "$@"
diff --git a/configure.ac b/configure.ac
index 879386a9..dac09f44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,6 @@ AC_DEFUN_ONCE([MACRO_CHECK],
 	ifdef([$1], true, [AC_FATAL([Please install autoconf-archive],)])
 ])
 
-MACRO_CHECK([AX_VALGRIND_DFLT])
 MACRO_CHECK([AX_VALGRIND_CHECK])
 MACRO_CHECK([AX_CODE_COVERAGE])
 
@@ -375,7 +374,6 @@ AC_ARG_ENABLE([autogopath],
 )
 AM_CONDITIONAL([AUTOGOPATH], [test x$autogopath = xtrue])
 
-AX_VALGRIND_DFLT([sgcheck], [off])
 AX_VALGRIND_CHECK
 AX_CODE_COVERAGE