2
0
mirror of https://gitlab.com/apparmor/apparmor synced 2025-08-22 10:07:12 +00:00

Subject: libapparmor - fail configure if interpreter for lang bindings not found

This patch causes libapparmor's configure script to exit with an error
if a language binding is asked for and the relevant interpreter is not
found. The previous behavior was to *silently* disable the binding.

Signed-off-by: Steve Beattie <steve@nxnw.org>
Acked-by: Tyler Hicks <tyhicks@canonical.com>
This commit is contained in:
Steve Beattie 2013-09-06 13:43:52 -07:00
parent e5ce6f92ac
commit 54b6b527c7

View File

@ -23,15 +23,12 @@ AC_ARG_WITH(python,
[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)]) [AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
if test "$with_python" = "yes"; then if test "$with_python" = "yes"; then
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling python bindings]) test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling python bindings])
AC_PATH_PROG(PYTHON, python, no) AC_PATH_PROG(PYTHON, python)
if test x$PYTHON = xno; then test -z "$PYTHON" && AC_MSG_ERROR([python is required when enabling python bindings])
enable_python = no
else
sinclude(m4/ac_python_devel.m4) sinclude(m4/ac_python_devel.m4)
AC_PYTHON_DEVEL AC_PYTHON_DEVEL
AM_PATH_PYTHON AM_PATH_PYTHON
fi fi
fi
AC_MSG_CHECKING(Checking for perl) AC_MSG_CHECKING(Checking for perl)
AC_ARG_WITH(perl, AC_ARG_WITH(perl,
@ -39,14 +36,11 @@ AC_ARG_WITH(perl,
[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)]) [AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
if test "$with_perl" = "yes"; then if test "$with_perl" = "yes"; then
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling perl bindings]) test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling perl bindings])
AC_PATH_PROG(PERL, perl, no) AC_PATH_PROG(PERL, perl)
if test x$PERL = xno; then test -z "$PERL" && AC_MSG_ERROR([perl is required when enabling perl bindings])
enable_perl=no
else
perl_includedir="`$PERL -e 'use Config; print $Config{archlib}'`/CORE" perl_includedir="`$PERL -e 'use Config; print $Config{archlib}'`/CORE"
AC_CHECK_FILE($perl_includedir/perl.h, enable_perl=yes, enable_perl=no) AC_CHECK_FILE($perl_includedir/perl.h, enable_perl=yes, enable_perl=no)
fi fi
fi
AC_MSG_CHECKING(Checking for ruby) AC_MSG_CHECKING(Checking for ruby)
@ -56,6 +50,7 @@ AC_ARG_WITH(ruby,
if test "$with_ruby" = "yes"; then if test "$with_ruby" = "yes"; then
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling ruby bindings]) test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling ruby bindings])
AC_PATH_PROG([RUBY], [ruby]) AC_PATH_PROG([RUBY], [ruby])
test -z "$RUBY" && AC_MSG_ERROR([ruby is required when enabling ruby bindings])
fi fi