summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure304
1 files changed, 286 insertions, 18 deletions
diff --git a/configure b/configure
index 3af1f796..9efc7a75 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dbus 1.9.10.
+# Generated by GNU Autoconf 2.69 for dbus 1.9.12.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=dbus>.
#
@@ -591,8 +591,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='dbus'
PACKAGE_TARNAME='dbus'
-PACKAGE_VERSION='1.9.10'
-PACKAGE_STRING='dbus 1.9.10'
+PACKAGE_VERSION='1.9.12'
+PACKAGE_STRING='dbus 1.9.12'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=dbus'
PACKAGE_URL=''
@@ -680,6 +680,10 @@ DBUS_CAN_UPLOAD_DOCS_TRUE
DBUS_XML_DOCS_ENABLED_FALSE
DBUS_XML_DOCS_ENABLED_TRUE
XMLTO
+DBUS_DUCKTYPE_DOCS_ENABLED_FALSE
+DBUS_DUCKTYPE_DOCS_ENABLED_TRUE
+YELP_BUILD
+DUCKTYPE
DBUS_HAVE_XSLTPROC_FALSE
DBUS_HAVE_XSLTPROC_TRUE
XSLTPROC
@@ -715,6 +719,8 @@ HAVE_LINUX_EPOLL_FALSE
HAVE_LINUX_EPOLL_TRUE
DBUS_BUS_ENABLE_INOTIFY_FALSE
DBUS_BUS_ENABLE_INOTIFY_TRUE
+APPARMOR_LIBS
+APPARMOR_CFLAGS
HAVE_SELINUX_FALSE
HAVE_SELINUX_TRUE
THREAD_LIBS
@@ -916,8 +922,10 @@ enable_asserts
enable_checks
enable_xml_docs
enable_doxygen_docs
+enable_ducktype_docs
enable_abstract_sockets
enable_selinux
+enable_apparmor
enable_libaudit
enable_inotify
enable_kqueue
@@ -971,6 +979,8 @@ DBUS_GLIB_CFLAGS
DBUS_GLIB_LIBS
PYTHON
THREAD_LIBS
+APPARMOR_CFLAGS
+APPARMOR_LIBS
SYSTEMD_CFLAGS
SYSTEMD_LIBS
VALGRIND_CFLAGS
@@ -1516,7 +1526,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures dbus 1.9.10 to adapt to many kinds of systems.
+\`configure' configures dbus 1.9.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1590,7 +1600,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of dbus 1.9.10:";;
+ short | recursive ) echo "Configuration of dbus 1.9.12:";;
esac
cat <<\_ACEOF
@@ -1624,9 +1634,11 @@ Optional Features:
--enable-checks include sanity checks on public API
--enable-xml-docs build XML documentation (requires xmlto)
--enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)
+ --enable-ducktype-docs build Ducktype documentation (requires Ducktype)
--enable-abstract-sockets
use abstract socket namespace (linux only)
--enable-selinux build with SELinux support
+ --enable-apparmor build with AppArmor support
--enable-libaudit build audit daemon support for SELinux
--enable-inotify build with inotify support (linux only)
--enable-kqueue build with kqueue support
@@ -1713,6 +1725,10 @@ Some influential environment variables:
linker flags for DBUS_GLIB, overriding pkg-config
PYTHON the Python interpreter
THREAD_LIBS
+ APPARMOR_CFLAGS
+ C compiler flags for APPARMOR, overriding pkg-config
+ APPARMOR_LIBS
+ linker flags for APPARMOR, overriding pkg-config
SYSTEMD_CFLAGS
C compiler flags for SYSTEMD, overriding pkg-config
SYSTEMD_LIBS
@@ -1789,7 +1805,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-dbus configure 1.9.10
+dbus configure 1.9.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2565,7 +2581,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by dbus $as_me 1.9.10, which was
+It was created by dbus $as_me 1.9.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -3508,7 +3524,7 @@ fi
# Define the identity of the package.
PACKAGE='dbus'
- VERSION='1.9.10'
+ VERSION='1.9.12'
cat >>confdefs.h <<_ACEOF
@@ -3804,16 +3820,16 @@ _ACEOF
#
## increment if the interface has additions, changes, removals.
-LT_CURRENT=14
+LT_CURRENT=15
## increment any time the source changes; set to
## 0 if you increment CURRENT
-LT_REVISION=3
+LT_REVISION=0
## increment if any interfaces have been added; set to 0
## if any interfaces have been changed or removed. removal has
## precedence over adding, so set to 0 if both happened.
-LT_AGE=11
+LT_AGE=12
@@ -3821,8 +3837,8 @@ LT_AGE=11
DBUS_MAJOR_VERSION=1
DBUS_MINOR_VERSION=9
-DBUS_MICRO_VERSION=10
-DBUS_VERSION=1.9.10
+DBUS_MICRO_VERSION=12
+DBUS_VERSION=1.9.12
@@ -16811,6 +16827,13 @@ else
enable_doxygen_docs=auto
fi
+# Check whether --enable-ducktype-docs was given.
+if test "${enable_ducktype_docs+set}" = set; then :
+ enableval=$enable_ducktype_docs; enable_ducktype_docs=$enableval
+else
+ enable_ducktype_docs=auto
+fi
+
# Check whether --enable-abstract-sockets was given.
if test "${enable_abstract_sockets+set}" = set; then :
enableval=$enable_abstract_sockets; enable_abstract_sockets=$enableval
@@ -16825,6 +16848,13 @@ else
enable_selinux=auto
fi
+# Check whether --enable-apparmor was given.
+if test "${enable_apparmor+set}" = set; then :
+ enableval=$enable_apparmor; enable_apparmor=$enableval
+else
+ enable_apparmor=auto
+fi
+
# Check whether --enable-libaudit was given.
if test "${enable_libaudit+set}" = set; then :
enableval=$enable_libaudit; enable_libaudit=$enableval
@@ -20150,6 +20180,95 @@ else
SELINUX_LIBS=
fi
+# AppArmor detection
+if test x$enable_apparmor = xno; then :
+ have_apparmor=no
+else
+
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for APPARMOR" >&5
+$as_echo_n "checking for APPARMOR... " >&6; }
+
+if test -n "$APPARMOR_CFLAGS"; then
+ pkg_cv_APPARMOR_CFLAGS="$APPARMOR_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor >= 2.8.95\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libapparmor >= 2.8.95") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_APPARMOR_CFLAGS=`$PKG_CONFIG --cflags "libapparmor >= 2.8.95" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$APPARMOR_LIBS"; then
+ pkg_cv_APPARMOR_LIBS="$APPARMOR_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libapparmor >= 2.8.95\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libapparmor >= 2.8.95") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_APPARMOR_LIBS=`$PKG_CONFIG --libs "libapparmor >= 2.8.95" 2>/dev/null`
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
+else
+ _pkg_short_errors_supported=no
+fi
+ if test $_pkg_short_errors_supported = yes; then
+ APPARMOR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libapparmor >= 2.8.95" 2>&1`
+ else
+ APPARMOR_PKG_ERRORS=`$PKG_CONFIG --print-errors "libapparmor >= 2.8.95" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$APPARMOR_PKG_ERRORS" >&5
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+ have_apparmor=no
+elif test $pkg_failed = untried; then
+ have_apparmor=no
+else
+ APPARMOR_CFLAGS=$pkg_cv_APPARMOR_CFLAGS
+ APPARMOR_LIBS=$pkg_cv_APPARMOR_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+ have_apparmor=yes
+fi
+
+ if test x$enable_apparmor = xauto && test x$have_apparmor = xno; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Sufficiently new AppArmor library not found" >&5
+$as_echo "$as_me: WARNING: Sufficiently new AppArmor library not found" >&2;}
+fi
+ if test x$enable_apparmor != xauto && test x$have_apparmor = xno; then :
+ as_fn_error $? "AppArmor explicitly required, and AppArmor library not found" "$LINENO" 5
+fi
+
+fi
+
+if test x$have_apparmor = xyes; then :
+
+$as_echo "#define HAVE_APPARMOR 1" >>confdefs.h
+
+fi
+
# inotify checks
if test x$enable_inotify = xno ; then
have_inotify=no;
@@ -22211,6 +22330,145 @@ else
fi
+### Ducktype/Yelp documentation
+
+# Extract the first word of "ducktype", so it can be a program name with args.
+set dummy ducktype; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_DUCKTYPE+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $DUCKTYPE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_DUCKTYPE="$DUCKTYPE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_DUCKTYPE="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_DUCKTYPE" && ac_cv_path_DUCKTYPE="no"
+ ;;
+esac
+fi
+DUCKTYPE=$ac_cv_path_DUCKTYPE
+if test -n "$DUCKTYPE"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DUCKTYPE" >&5
+$as_echo "$DUCKTYPE" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+# Extract the first word of "yelp-build", so it can be a program name with args.
+set dummy yelp-build; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_YELP_BUILD+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ case $YELP_BUILD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_YELP_BUILD="$YELP_BUILD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ ac_cv_path_YELP_BUILD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_YELP_BUILD" && ac_cv_path_YELP_BUILD="no"
+ ;;
+esac
+fi
+YELP_BUILD=$ac_cv_path_YELP_BUILD
+if test -n "$YELP_BUILD"; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $YELP_BUILD" >&5
+$as_echo "$YELP_BUILD" >&6; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Ducktype documentation" >&5
+$as_echo_n "checking whether to build Ducktype documentation... " >&6; }
+
+if test "$DUCKTYPE" = "no"; then :
+ have_ducktype=no
+else
+ have_ducktype=yes
+fi
+if test "$YELP_BUILD" = "no"; then :
+ have_yelp_build=no
+else
+ have_yelp_build=yes
+fi
+
+if test "$enable_ducktype_docs" = "auto"; then :
+
+ if test "$have_ducktype" = "no" || test "$have_yelp_build" = "no"; then :
+
+ enable_ducktype_docs=no
+
+else
+
+ enable_ducktype_docs=yes
+
+fi
+
+fi
+
+if test "$enable_ducktype_docs" = "yes"; then :
+
+ if test "$have_ducktype" = "no"; then :
+
+ as_fn_error $? "Building Ducktype docs explicitly required, but ducktype not found" "$LINENO" 5
+
+fi
+ if test "$have_yelp_build" = "no"; then :
+
+ as_fn_error $? "Building Ducktype docs explicitly required, but yelp-build not found" "$LINENO" 5
+
+fi
+
+fi
+
+ if test "$enable_ducktype_docs" = "yes"; then
+ DBUS_DUCKTYPE_DOCS_ENABLED_TRUE=
+ DBUS_DUCKTYPE_DOCS_ENABLED_FALSE='#'
+else
+ DBUS_DUCKTYPE_DOCS_ENABLED_TRUE='#'
+ DBUS_DUCKTYPE_DOCS_ENABLED_FALSE=
+fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_ducktype_docs" >&5
+$as_echo "$enable_ducktype_docs" >&6; }
+
### XML Documentation
# Extract the first word of "xmlto", so it can be a program name with args.
@@ -22289,7 +22547,8 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_xml_docs" >&5
$as_echo "$enable_xml_docs" >&6; }
- if test x$enable_doxygen_docs = xyes && test x$enable_xml_docs = xyes; then
+ if test x$enable_doxygen_docs = xyes && test x$enable_xml_docs = xyes &&
+ test x$enable_ducktype_docs = xyes; then
DBUS_CAN_UPLOAD_DOCS_TRUE=
DBUS_CAN_UPLOAD_DOCS_FALSE='#'
else
@@ -22930,7 +23189,7 @@ $as_echo "#define DBUS_ENABLE_STATS 1" >>confdefs.h
fi
-ac_config_files="$ac_config_files Doxyfile dbus/versioninfo.rc dbus/dbus-arch-deps.h bus/system.conf bus/session.conf bus/example-system-enable-stats.conf bus/example-session-disable-stats.conf bus/messagebus bus/messagebus-config bus/org.freedesktop.dbus-session.plist bus/rc.messagebus bus/dbus.service bus/dbus.socket Makefile dbus/Makefile bus/Makefile tools/Makefile test/Makefile test/name-test/Makefile doc/Makefile doc/dbus-cleanup-sockets.1.xml doc/dbus-daemon.1.xml doc/dbus-launch.1.xml doc/dbus-monitor.1.xml doc/dbus-run-session.1.xml doc/dbus-send.1.xml doc/dbus-uuidgen.1.xml dbus-1.pc dbus-1-uninstalled.pc"
+ac_config_files="$ac_config_files Doxyfile dbus/versioninfo.rc dbus/dbus-arch-deps.h bus/system.conf bus/session.conf bus/example-system-enable-stats.conf bus/example-session-disable-stats.conf bus/messagebus bus/messagebus-config bus/org.freedesktop.dbus-session.plist bus/rc.messagebus bus/dbus.service bus/dbus.socket Makefile dbus/Makefile bus/Makefile tools/Makefile test/Makefile test/name-test/Makefile doc/Makefile doc/dbus-cleanup-sockets.1.xml doc/dbus-daemon.1.xml doc/dbus-launch.1.xml doc/dbus-monitor.1.xml doc/dbus-run-session.1.xml doc/dbus-send.1.xml doc/dbus-test-tool.1.xml doc/dbus-uuidgen.1.xml dbus-1.pc dbus-1-uninstalled.pc"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -23146,6 +23405,10 @@ if test -z "${DBUS_HAVE_XSLTPROC_TRUE}" && test -z "${DBUS_HAVE_XSLTPROC_FALSE}"
as_fn_error $? "conditional \"DBUS_HAVE_XSLTPROC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${DBUS_DUCKTYPE_DOCS_ENABLED_TRUE}" && test -z "${DBUS_DUCKTYPE_DOCS_ENABLED_FALSE}"; then
+ as_fn_error $? "conditional \"DBUS_DUCKTYPE_DOCS_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
if test -z "${DBUS_XML_DOCS_ENABLED_TRUE}" && test -z "${DBUS_XML_DOCS_ENABLED_FALSE}"; then
as_fn_error $? "conditional \"DBUS_XML_DOCS_ENABLED\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -23567,7 +23830,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by dbus $as_me 1.9.10, which was
+This file was extended by dbus $as_me 1.9.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23633,7 +23896,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-dbus config.status 1.9.10
+dbus config.status 1.9.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@@ -24252,6 +24515,7 @@ do
"doc/dbus-monitor.1.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus-monitor.1.xml" ;;
"doc/dbus-run-session.1.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus-run-session.1.xml" ;;
"doc/dbus-send.1.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus-send.1.xml" ;;
+ "doc/dbus-test-tool.1.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus-test-tool.1.xml" ;;
"doc/dbus-uuidgen.1.xml") CONFIG_FILES="$CONFIG_FILES doc/dbus-uuidgen.1.xml" ;;
"dbus-1.pc") CONFIG_FILES="$CONFIG_FILES dbus-1.pc" ;;
"dbus-1-uninstalled.pc") CONFIG_FILES="$CONFIG_FILES dbus-1-uninstalled.pc" ;;
@@ -25953,7 +26217,9 @@ echo "
32-bit int: ${DBUS_INT32_TYPE}
16-bit int: ${DBUS_INT16_TYPE}
Doxygen: ${DOXYGEN:-not found}
- xmlto: ${XMLTO:-not found}"
+ xmlto: ${XMLTO:-not found}
+ ducktype: ${DUCKTYPE:-not found}
+ yelp-build: ${YELP_BUILD:-not found}"
echo "
Rebuilding generated files: ${USE_MAINTAINER_MODE}
@@ -25968,11 +26234,13 @@ echo "
Building checks: ${enable_checks}
Building bus stats API: ${enable_stats}
Building SELinux support: ${have_selinux}
+ Building AppArmor support: ${have_apparmor}
Building inotify support: ${have_inotify}
Building kqueue support: ${have_kqueue}
Building systemd support: ${have_systemd}
Building X11 code: ${have_x11}
Building Doxygen docs: ${enable_doxygen_docs}
+ Building Ducktype docs: ${enable_ducktype_docs}
Building XML docs: ${enable_xml_docs}
Building launchd support: ${have_launchd}
Init scripts style: ${with_init_scripts}