mirrors/apparmor
1
0
Fork 0
mirror of https://gitlab.com/apparmor/apparmor.git synced 2025-03-04 08:24:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
apparmor/libraries/libapparmor/configure.ac

91 lines
2.6 KiB
Text
Raw Normal View History

This patch moves the overall version definition of the software out of the common/Make.rules file into common/Version so that libapparmor's configure.in can make use of it, meaning there's one less thing to adjust when updating the version. It also bumps the trunk version from 2.5 to 2.5.90 in (perhaps excessively long) preparation for the 2.6.0 release, and to indicate that it's newer than the 2.5.x branch.
2010-10-07 15:37:30 -07:00
m4_define([__apparmor_version], m4_sinclude(common/Version))
m4_ifdef(__apparmor_version, , m4_define([__apparmor_version], m4_sinclude(../../common/Version)))
m4_define([__aalen], decr(len(__apparmor_version)))
m4_define([apparmor_version], m4_substr(__apparmor_version, 0, __aalen))
Subject: libapparmor - rename configure.in to configure.ac The oldstyle name configure.in has been deprecated by autotools. This patch renames configure.in to the new standard name configure.ac. The AC_INIT() entry was adjusted as well to point to configure.ac instead of configure.in. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:49:00 -07:00
AC_INIT(configure.ac)
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
This patch moves the overall version definition of the software out of the common/Make.rules file into common/Version so that libapparmor's configure.in can make use of it, meaning there's one less thing to adjust when updating the version. It also bumps the trunk version from 2.5 to 2.5.90 in (perhaps excessively long) preparation for the 2.6.0 release, and to indicate that it's newer than the 2.5.x branch.
2010-10-07 15:37:30 -07:00
AM_INIT_AUTOMAKE(libapparmor1, apparmor_version)
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AM_PROG_LEX
AC_PROG_YACC
This patch modifies the logparsing portion of libapparmor to reverse map ip protocol numbers to their names (e.g. 6 -> "tcp").
2008-02-26 12:30:48 +00:00
AC_PROG_SED
Given that we want to do more apparmor things in user space (dbus mediation, file picker, etc.), making it easier for other source bases to detect the presence of libapparmor would be beneficial. This patch adds pkg-config support to the build infrastructure for libapparmor. Signed-off-by: Steve Beattie <sbeattie@ubuntu.com> Acked-by: Kees Cook <kees@ubuntu.com>
2012-11-14 11:00:06 -08:00
PKG_PROG_PKG_CONFIG
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_PATH_PROG([SWIG], [swig])
libapparmor: Check for podchecker during configure stage Fail the configure stage if podchecker is not available since man page generation always happens. Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Steve Beattie <steve@nxnw.org>
2014-11-17 21:19:55 -06:00
sinclude(m4/ac_podchecker.m4)
PROG_PODCHECKER
Submitted By: Mario Fetka (mario dot fetka at gmail dot com) Acked-By: Steve Beattie <steve@nxnw.org> This patch allows libapparmor to be built out of tree.
2009-05-12 21:56:56 +00:00
sinclude(m4/ac_pod2man.m4)
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
PROG_POD2MAN
Subject: libapparmor - enhance readability of binding checking message This patch makes the binding check messages a little more understandable and coherent. The original messages looked like (for a perl binding only build): checking Checking for Python... no checking Checking for perl... yes checking for perl... /usr/bin/perl Note the duplicated 'checking Checking' and '[cC]hecking for perl' statements. With the patch applied, the output looks like thus: checking whether python bindings are enabled... no checking whether perl bindings are enabled... yes checking for perl... /usr/bin/perl Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:45:15 -07:00
AC_MSG_CHECKING([whether python bindings are enabled])
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_ARG_WITH(python,
[ --with-python enable the python wrapper [[default=no]]],
[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
if test "$with_python" = "yes"; then
Subject: libapparmor - fail configure if swig not found This patch causes libapparmor's configure script to exit with an error if any of the language bindings are requested but swig has not been found earlier in the configure script. Without this script, configure would bury the inability to find swig in its output, without informing the user that building any of the language bindings would fail. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:42:46 -07:00
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling python bindings])
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>
2013-09-06 13:43:52 -07:00
AC_PATH_PROG(PYTHON, python)
test -z "$PYTHON" && AC_MSG_ERROR([python is required when enabling python bindings])
sinclude(m4/ac_python_devel.m4)
AC_PYTHON_DEVEL
AM_PATH_PYTHON
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
fi
Subject: libapparmor - enhance readability of binding checking message This patch makes the binding check messages a little more understandable and coherent. The original messages looked like (for a perl binding only build): checking Checking for Python... no checking Checking for perl... yes checking for perl... /usr/bin/perl Note the duplicated 'checking Checking' and '[cC]hecking for perl' statements. With the patch applied, the output looks like thus: checking whether python bindings are enabled... no checking whether perl bindings are enabled... yes checking for perl... /usr/bin/perl Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:45:15 -07:00
AC_MSG_CHECKING([whether perl bindings are enabled])
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_ARG_WITH(perl,
libapparmor: Fix spacing in the configure script usage Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com>
2014-11-17 21:20:11 -06:00
[ --with-perl enable the perl wrapper [[default=no]]],
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
if test "$with_perl" = "yes"; then
Subject: libapparmor - fail configure if swig not found This patch causes libapparmor's configure script to exit with an error if any of the language bindings are requested but swig has not been found earlier in the configure script. Without this script, configure would bury the inability to find swig in its output, without informing the user that building any of the language bindings would fail. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:42:46 -07:00
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling perl bindings])
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>
2013-09-06 13:43:52 -07:00
AC_PATH_PROG(PERL, perl)
test -z "$PERL" && AC_MSG_ERROR([perl is required when enabling perl bindings])
perl_includedir="`$PERL -e 'use Config; print $Config{archlib}'`/CORE"
AC_CHECK_FILE($perl_includedir/perl.h, enable_perl=yes, enable_perl=no)
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
fi
Subject: libapparmor - enhance readability of binding checking message This patch makes the binding check messages a little more understandable and coherent. The original messages looked like (for a perl binding only build): checking Checking for Python... no checking Checking for perl... yes checking for perl... /usr/bin/perl Note the duplicated 'checking Checking' and '[cC]hecking for perl' statements. With the patch applied, the output looks like thus: checking whether python bindings are enabled... no checking whether perl bindings are enabled... yes checking for perl... /usr/bin/perl Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:45:15 -07:00
AC_MSG_CHECKING([whether ruby bindings are enabled])
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_ARG_WITH(ruby,
libapparmor: Fix spacing in the configure script usage Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Acked-by: Seth Arnold <seth.arnold@canonical.com>
2014-11-17 21:20:11 -06:00
[ --with-ruby enable the ruby wrapper [[default=no]]],
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
[AC_MSG_RESULT($withval)], [AC_MSG_RESULT(no)])
if test "$with_ruby" = "yes"; then
Subject: libapparmor - fail configure if swig not found This patch causes libapparmor's configure script to exit with an error if any of the language bindings are requested but swig has not been found earlier in the configure script. Without this script, configure would bury the inability to find swig in its output, without informing the user that building any of the language bindings would fail. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 13:42:46 -07:00
test -z "$SWIG" && AC_MSG_ERROR([swig is required when enabling ruby bindings])
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_PATH_PROG([RUBY], [ruby])
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>
2013-09-06 13:43:52 -07:00
test -z "$RUBY" && AC_MSG_ERROR([ruby is required when enabling ruby bindings])
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
fi
AM_CONDITIONAL(HAVE_PYTHON, test x$with_python = xyes)
AM_CONDITIONAL(HAVE_PERL, test x$with_perl = xyes)
AM_CONDITIONAL(HAVE_RUBY, test x$with_ruby = xyes)
AC_HEADER_STDC
AC_CHECK_HEADERS(unistd.h stdint.h)
- Add configure check for the existence of asprint(3). - Add -Wall to compilation (is there a way to only define this in the toplevel Makefile.am and have it propogate down?) - fix warnings once -Wall was enabled: - no asprintf prototype due to _GNU_SOURCE not being defined - possible uninitialezed use in scanner.l - printf's that expected ints but were passed longs in the testsuite
2007-08-21 17:28:34 +00:00
AC_CHECK_FUNCS(asprintf)
- Was previously under the belief that pid="1234" and magic_token="1245353" were correct syntax from the kernel. It turns out this is not the case.
2007-08-05 22:54:41 +00:00
AM_PROG_CC_C_O
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
AC_C_CONST
AM_PROG_LIBTOOL
AC_OUTPUT(
Makefile
doc/Makefile
src/Makefile
swig/Makefile
swig/perl/Makefile
Submitted By: Mario Fetka (mario dot fetka at gmail dot com) Acked-By: Steve Beattie <steve@nxnw.org> This patch allows libapparmor to be built out of tree.
2009-05-12 21:56:56 +00:00
swig/perl/Makefile.PL
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
swig/python/Makefile
Submitted By: Mario Fetka (mario dot fetka at gmail dot com) Acked-By: Steve Beattie <steve@nxnw.org> This patch allows libapparmor to be built out of tree.
2009-05-12 21:56:56 +00:00
swig/python/setup.py
Subject: libapparmor - add python bindings tests based on C tests This patch adds tests for the swig generated python library bindings that reuse the C language tests. Fitting it into autotools was a bit of a trick, and is likely pretty brittle, as before the test script runs, it needs to know the location of the built libapparmor.so library, the built _LibAppArmor.so library and the python wrapper bits (thankfully, the latter two are the same directory). It's also unclear how to get autotools to emit the output of the test_python.py script when building, rather than just summarizing it as one test run. Also note that test_python.py is doing a bit of magic to automatically generate test case methods based on the contents of the test_multi/ directory. This has the disadvantage of breaking tools like nosetests and other external tools that try to automatically detect testcases. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2013-09-06 14:18:08 -07:00
swig/python/test/Makefile
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
swig/ruby/Makefile
testsuite/Makefile
testsuite/config/Makefile
testsuite/libaalogparse.test/Makefile
testsuite/lib/Makefile
libapparmor: move public headers to separate directory This patch moves the apparmor.h and aalogparse.h headers from the libapparmor/src/ directory to a new directory libapparmor/include/. The apparmor.h header is stored in a sys/ directory within libapparmor/include/ to match its usual install location in /usr/include/sys/, simplifying the #include statements of source that wishes to include either the in-tree or system installed version of the header (i.e. #include <sys/apparmor.h> can be used everywhere). The patch size is inflated by the movements of the header files, which are unchanged except for their locations. Otherwise, the rest of the changes are to modify the include search path or to stop looking in $CWD for one of the headers. Signed-off-by: Steve Beattie <steve@nxnw.org> Acked-by: Tyler Hicks <tyhicks@canonical.com>
2014-01-06 14:08:55 -08:00
include/Makefile
include/sys/Makefile
- Merged the library previously known as "libaalogparse" with libapparmor. - Moved the old libapparmor library to libapparmor-deprecated.
2007-07-28 15:41:04 +00:00
)
Reference in a new issue Copy permalink