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 <[email protected]>
intel · May 18, 2017 · 161aa5c · 161aa5c
1 parent 61e9dbc
commit 161aa5c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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