diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-09-01 16:06:10 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-09-01 16:06:10 +0000 |
| commit | 1932afdc38467f1cf46797fac4cd4fa15ecc4833 (patch) | |
| tree | fb3c49fd4eaf2bcc25eb581cbbdce7d333b54293 | |
| parent | 0a90d29583be3161bf59d0abcbf874ad0ebfdd43 (diff) | |
| parent | 4afcc805442e808a68c965644db69f481b0feb5d (diff) | |
Merge branch 'remove-autotools-support' into 'master'
Remove autotools build support
Closes #443
See merge request dbus/dbus!378
| -rw-r--r-- | .gitignore | 23 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 52 | ||||
| -rw-r--r-- | INSTALL | 8 | ||||
| -rw-r--r-- | Makefile.am | 63 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rwxr-xr-x | autogen.sh | 108 | ||||
| -rw-r--r-- | bus/Makefile.am | 255 | ||||
| -rw-r--r-- | configure.ac | 1817 | ||||
| -rw-r--r-- | dbus-1-uninstalled.pc.in | 20 | ||||
| -rw-r--r-- | dbus/Makefile.am | 340 | ||||
| -rw-r--r-- | doc/Makefile.am | 230 | ||||
| -rw-r--r-- | m4/ax_ac_append_to_file.m4 | 32 | ||||
| -rw-r--r-- | m4/ax_ac_print_to_file.m4 | 32 | ||||
| -rw-r--r-- | m4/ax_add_am_macro_static.m4 | 28 | ||||
| -rw-r--r-- | m4/ax_am_macros_static.m4 | 38 | ||||
| -rw-r--r-- | m4/ax_code_coverage.m4 | 272 | ||||
| -rw-r--r-- | m4/ax_file_escapes.m4 | 30 | ||||
| -rw-r--r-- | m4/ld-version-script.m4 | 44 | ||||
| -rw-r--r-- | m4/visibility.m4 | 78 | ||||
| -rw-r--r-- | test/Makefile.am | 925 | ||||
| -rw-r--r-- | test/name-test/Makefile.am | 125 | ||||
| -rw-r--r-- | tools/Makefile.am | 158 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 103 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 11 |
24 files changed, 16 insertions, 4778 deletions
@@ -1,56 +1,33 @@ /*.pc /.ccache/ /Doxyfile -/aclocal.m4 -/aminclude_static.am -/autom4te.cache /build/ -/build-aux/ /bus/tmpfiles.d/dbus.conf /ci-build*/ /*-prefix/ *.zst* file*.lst /cmake/DBus1Config*.cmake -/config.cache -/config.h -/config.h.in -/config.log -/config.status -/configure /dbus-1.*-coverage.info /dbus-1.*-coverage.info.tmp /dbus-1.*-coverage/ /dbus-1.*.tar.* /dbus-1.*/ -/libtool -/m4/libtool.m4 -/m4/lt*.m4 -/m4/pkg.m4 /src-from-dist/ -/stamp-h -/stamp-h.in -/stamp-h1 -/test-driver - *.bb *.bbg *.da *.gcda *.gcno *.gcov -*.la -*.lo *.o *.orig *.rej *~ .*.sw? .deps/ -.dirstamp .libs/ Makefile -Makefile.in __pycache__/ cscope.out tags diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbf13c02..b385858d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -167,16 +167,6 @@ debian image: - .unix-host-build stage: build -debian autotools production: - extends: .debian-build - variables: - ci_variant: "production" - -debian autotools debug: - extends: .debian-build - variables: - ci_variant: "debug" - debian cmake: extends: - .cmake-common @@ -204,18 +194,13 @@ debian meson clang debug: - ./tools/ci-build.sh # Also test that we can be used as a subproject: # https://gitlab.freedesktop.org/dbus/dbus/-/merge_requests/388 + - meson dist -C $ci_builddir --formats xztar - mkdir -p test/use-as-subproject/subprojects/dbus - - tar --strip-components=1 -C test/use-as-subproject/subprojects/dbus -xf ci-build-dist/*.tar.xz + - tar --strip-components=1 -C test/use-as-subproject/subprojects/dbus -xf $ci_builddir/meson-dist/*.tar.xz - meson setup --wrap-mode=forcefallback test/use-as-subproject/_build test/use-as-subproject - meson compile -C test/use-as-subproject/_build - meson test -C test/use-as-subproject/_build -debian mingw32 autotools debug: - extends: .debian-build - variables: - ci_host: "i686-w64-mingw32" - ci_variant: "debug" - debian meson reduced: extends: - .meson-common @@ -246,14 +231,18 @@ debian mingw32 meson: extends: - .meson-common - .debian-build - when: manual variables: ci_host: "i686-w64-mingw32" -debian mingw64 autotools: - extends: .debian-build +debian mingw32 meson debug: + extends: + - .meson-common + - .debian-build + when: manual variables: - ci_host: "x86_64-w64-mingw32" + ci_buildsys: "meson" + ci_host: "i686-w64-mingw32" + ci_variant: "debug" debian mingw64 cmake debug: extends: @@ -273,11 +262,6 @@ debian mingw64 meson debug: ci_host: "x86_64-w64-mingw32" ci_variant: "debug" -debian buster autotools: - extends: .debian-build - when: manual - image: "debian:buster-slim" - opensuse image: extends: - .fdo.container-build@opensuse @@ -335,13 +319,6 @@ opensuse mingw64 meson debug: variables: ci_distro: "ubuntu" -ubuntu jammy autotools: - extends: .ubuntu-build - when: manual - image: "ubuntu:jammy" - variables: - ci_suite: "jammy" - .win-build: image: $WINDOWS_IMAGE stage: build @@ -493,15 +470,6 @@ freebsd cmake release: # massively increases the VM image (and therefore container) size. CI_BUILD_ARGS: "-DDBUS_ENABLE_DOXYGEN_DOCS=OFF -DDBUS_ENABLE_XML_DOCS=ON -DCMAKE_BUILD_TYPE=Release" -freebsd autotools: - extends: .build-env-freebsd - variables: - ci_buildsys: "autotools" - # We don't build doxygen documentation, so the make dbus-docs.tar.xz target - # is not available. Set ci_variant to avoid building that target. - ci_variant: "production-no-upload-docs" - CI_BUILD_ARGS: "--enable-xml-docs" - freebsd meson: extends: - .build-env-freebsd @@ -4,7 +4,7 @@ Quick start =========== -This branch of dbus can be built by using Meson, GNU Autotools or CMake. +This branch of dbus can be built by using Meson or CMake. The Meson build system is the recommended build system for the master branch (versions >= 1.15.0), except when building on Windows, for which CMake is recommended (this recommendation might change to Meson in future). @@ -48,12 +48,6 @@ See `meson_options.txt` for details of dbus-specific options, and <https://mesonbuild.com/Builtin-options.html> for details of generic Meson options. -Other build systems -------------------- - -When using Autotools, run "./configure --help" to see the possible -configuration options and environment variables. - When using CMake, inspect README.cmake to see the possible configuration options and environment variables. diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index 1fe2bb47..00000000 --- a/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -SUBDIRS=dbus bus tools test doc - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dbus-1.pc - -cmakeconfigdir = $(libdir)/cmake/DBus1 -cmakeconfig_DATA = cmake/DBus1Config.cmake \ - cmake/DBus1ConfigVersion.cmake - -EXTRA_DIST = \ - autogen.sh \ - CONTRIBUTING.md \ - dbus-1.pc.in \ - cleanup-man-pages.sh \ - LICENSES/AFL-2.0.txt \ - LICENSES/AFL-2.1.txt \ - LICENSES/Apache-2.0.txt \ - LICENSES/BSD-3-Clause.txt \ - LICENSES/GPL-2.0-or-later.txt \ - LICENSES/LGPL-2.1-or-later.txt \ - LICENSES/LicenseRef-CMakeScripts.txt \ - LICENSES/LicenseRef-GAP.txt \ - LICENSES/LicenseRef-pycrypto-orig.txt \ - LICENSES/MIT.txt \ - LICENSES/TCL.txt \ - NEWS.pre-1-0 \ - NEWS.pre-1-2 \ - README.cmake \ - README.valgrind \ - README.win \ - README.wince \ - README.cygwin \ - README.launchd \ - CMakeLists.txt \ - bus/CMakeLists.txt \ - dbus/CMakeLists.txt \ - doc/CMakeLists.txt \ - maint/update-authors.sh \ - meson.build \ - meson_options.txt \ - meson_post_install.py \ - subprojects/expat.wrap \ - subprojects/glib.wrap \ - test/CMakeLists.txt \ - test/name-test/CMakeLists.txt \ - tools/CMakeLists.txt \ - tools/check-runstatedir.sh \ - cmake \ - $(NULL) - -all-local: Doxyfile - -update-authors: - cd $(srcdir) && ./maint/update-authors.sh - -DISTCHECK_CONFIGURE_FLAGS = \ - --enable-xml-docs \ - --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir) - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -# Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE -include $(top_srcdir)/aminclude_static.am @@ -86,7 +86,7 @@ likely to have more bugs than stable releases, obviously. Configuration and installation === -This branch of dbus can be built by using Meson, GNU Autotools or CMake. +This branch of dbus can be built by using Meson or CMake. The Meson build system is the recommended build system for the master branch (versions >= 1.15.0), except when building on Windows, for which CMake is recommended (this recommendation might change to Meson in future). diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 6de735f0..00000000 --- a/autogen.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -srcdir=`dirname $0` -test -z "$srcdir" && srcdir=. - -ORIGDIR=`pwd` -cd $srcdir - -PROJECT=dbus -TEST_TYPE=-f -FILE=dbus-1.pc.in - -DIE=0 - -if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then - echo "Activating pre-commit hook." - cp .git/hooks/pre-commit.sample .git/hooks/pre-commit - chmod +x .git/hooks/pre-commit -fi - -(autoconf --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have autoconf installed to compile $PROJECT." - echo "Download the appropriate package for your distribution," - echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" - DIE=1 -} - -# If the user hasn't explicitly chosen an Automake version, use 1.11. This is -# the earliest version that gives us silent rules. -if test -z "$AUTOMAKE"; then - AUTOMAKE=automake-1.11 - ACLOCAL=aclocal-1.11 -fi - -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - AUTOMAKE=automake - ACLOCAL=aclocal -} - -($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have automake installed to compile $PROJECT." - echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz" - echo "(or a newer version if it is available)" - DIE=1 -} - -LIBTOOLIZE=`which libtoolize` -if ! test -f "$LIBTOOLIZE"; then - LIBTOOLIZE=`which glibtoolize` -fi - -($LIBTOOLIZE --version) < /dev/null > /dev/null 2>&1 || { - echo - echo "You must have libtoolize installed to compile $PROJECT." - echo "Install the libtool package from ftp.gnu.org or a mirror." - DIE=1 -} - -if test "$DIE" -eq 1; then - exit 1 -fi - -test $TEST_TYPE $FILE || { - echo "You must run this script in the top-level $PROJECT directory" - exit 1 -} - -if test -z "$*"; then - echo "I am going to run ./configure with no arguments - if you wish " - echo "to pass any to it, please specify them on the $0 command line." -fi - -$LIBTOOLIZE --copy --force - -$ACLOCAL -I m4 $ACLOCAL_FLAGS - -## optionally feature autoheader -(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader - -$AUTOMAKE -a $am_opt -if ! autoconf; then - echo "autoconf failed - version 2.5x is probably required" >&2 - exit 1 -fi - -cd $ORIGDIR - -if test x"$NOCONFIGURE" = x; then - run_configure=true - for arg in $*; do - case $arg in - --no-configure) - run_configure=false - ;; - *) - ;; - esac - done -else - run_configure=false -fi - -if $run_configure; then - $srcdir/configure --enable-developer --config-cache "$@" -fi diff --git a/bus/Makefile.am b/bus/Makefile.am deleted file mode 100644 index 1f5017c5..00000000 --- a/bus/Makefile.am +++ /dev/null @@ -1,255 +0,0 @@ -dbusdatadir=$(datadir)/dbus-1 -legacydbusdatadir=$(sysconfdir)/dbus-1 -dbus_daemon_execdir = $(DBUS_DAEMONDIR) -# Always lib, even if ${libdir} is lib64 or lib/x86_64-linux-gnu -systemdtmpfilesdir = $(prefix)/lib/tmpfiles.d -systemdsysusersdir = $(prefix)/lib/sysusers.d - -DBUS_BUS_LIBS = \ - $(CODE_COVERAGE_LIBS) \ - $(EXPAT_LIBS) \ - $(SELINUX_LIBS) \ - $(APPARMOR_LIBS) \ - $(THREAD_LIBS) \ - $(ADT_LIBS) \ - $(NETWORK_libs) \ - $(NULL) - -DBUS_LAUNCHER_LIBS = \ - $(CODE_COVERAGE_LIBS) \ - $(EXPAT_LIBS) \ - $(THREAD_LIBS) \ - $(NETWORK_libs) \ - $(NULL) - -AM_CPPFLAGS = \ - $(CODE_COVERAGE_CPPFLAGS) \ - -I$(top_srcdir) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ - $(EXPAT_CFLAGS) \ - $(APPARMOR_CFLAGS) \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \ - -DDBUS_RUNSTATEDIR=\""$(runstatedir)"\" \ - -DDBUS_COMPILATION \ - $(NULL) - -# if assertions are enabled, improve backtraces -AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ - -AM_CFLAGS = \ - $(CODE_COVERAGE_CFLAGS) \ - $(SANITIZE_CFLAGS) \ - $(NULL) - -EFENCE= - -EXTRA_DIST = \ - session.conf.in \ - system.conf.in \ - legacy-config/session.conf.in \ - legacy-config/system.conf.in \ - org.freedesktop.dbus-session.plist.in \ - example-system-enable-stats.conf.in \ - example-session-disable-stats.conf.in \ - $(NULL) - -dbusdata_DATA = session.conf -legacydbusdata_DATA = legacy-config/session.conf - -if DBUS_UNIX -dbusdata_DATA += system.conf -legacydbusdata_DATA += legacy-config/system.conf -endif - -examplesdir = ${docdir}/examples -examples_DATA = \ - example-system-enable-stats.conf \ - example-session-disable-stats.conf \ - $(NULL) - -dist_examples_DATA = \ - example-system-hardening-without-traditional-activation.conf \ - $(NULL) - -if DBUS_ENABLE_LAUNCHD -agentdir=$(LAUNCHD_AGENT_DIR) -agent_DATA=org.freedesktop.dbus-session.plist -endif - -if DBUS_BUS_ENABLE_KQUEUE -DIR_WATCH_SOURCE=dir-watch-kqueue.c -else -if DBUS_BUS_ENABLE_INOTIFY -DIR_WATCH_SOURCE=dir-watch-inotify.c -else -DIR_WATCH_SOURCE=dir-watch-default.c -endif -endif - -noinst_LTLIBRARIES = libdbus-daemon-internal.la - -libdbus_daemon_internal_la_SOURCES = \ - activation.c \ - activation.h \ - activation-exit-codes.h \ - apparmor.c \ - apparmor.h \ - audit.c \ - audit.h \ - bus.c \ - bus.h \ - config-loader-expat.c \ - config-parser.c \ - config-parser.h \ - config-parser-common.c \ - config-parser-common.h \ - connection.c \ - connection.h \ - containers.c \ - containers.h \ - desktop-file.c \ - desktop-file.h \ - $(DIR_WATCH_SOURCE) \ - dir-watch.h \ - dispatch.c \ - dispatch.h \ - driver.c \ - driver.h \ - expirelist.c \ - expirelist.h \ - policy.c \ - policy.h \ - selinux.h \ - selinux.c \ - services.c \ - services.h \ - signals.c \ - signals.h \ - stats.c \ - stats.h \ - test.c \ - test.h \ - utils.c \ - utils.h \ - $(NULL) - -libdbus_daemon_internal_la_LIBADD = \ - $(top_builddir)/dbus/libdbus-1.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(EFENCE) \ - $(DBUS_BUS_LIBS) \ - $(NULL) - -dbus_daemon_SOURCES = main.c -dbus_daemon_LDADD = libdbus-daemon-internal.la - -liblaunch_helper_internal_la_SOURCES = \ - config-loader-expat.c \ - config-parser-common.c \ - config-parser-common.h \ - config-parser-trivial.c \ - config-parser-trivial.h \ - desktop-file.c \ - desktop-file.h \ - utils.c \ - utils.h \ - activation-exit-codes.h \ - activation-helper.h \ - $(NULL) - -## This is the installed launch helper with the setuid checks -## All files that have special cases #ifdef ACTIVATION_LAUNCHER_TEST must -## be listed here and included in test/bus/launch-helper-for-tests.c, -## not in liblaunch-helper-internal.la. -dbus_daemon_launch_helper_SOURCES = \ - activation-helper.c \ - activation-helper-bin.c \ - $(NULL) -dbus_daemon_launch_helper_LDADD = liblaunch-helper-internal.la - -liblaunch_helper_internal_la_LIBADD = \ - $(top_builddir)/dbus/libdbus-1.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(DBUS_LAUNCHER_LIBS) - -noinst_PROGRAMS = -dbus_daemon_exec_PROGRAMS = dbus-daemon -if DBUS_UNIX -if ENABLE_TRADITIONAL_ACTIVATION -noinst_LTLIBRARIES += liblaunch-helper-internal.la -libexec_PROGRAMS = dbus-daemon-launch-helper -endif ENABLE_TRADITIONAL_ACTIVATION -endif DBUS_UNIX - -install-data-hook: - $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d - $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/services -if DBUS_UNIX - $(mkinstalldirs) $(DESTDIR)$(runstatedir)/dbus - $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system.d - $(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system-services -endif -if HAVE_SYSTEMD -# Install dbus.socket as default implementation of a D-Bus stack. -# Deliberately not using $(LN_S) here: ln -fs is not universally portable, -# but neither is systemd, so it's OK to assume here that ln complies with SUS. -# Unconditionally enable D-Bus on systemd installations - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants - ln -fs ../dbus.socket $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants/dbus.socket - $(mkinstalldirs) $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants - ln -fs ../dbus.service $(DESTDIR)$(systemdsystemunitdir)/multi-user.target.wants/dbus.service -endif -if DBUS_ENABLE_USER_SESSION - $(mkinstalldirs) $(DESTDIR)$(systemduserunitdir)/sockets.target.wants - ln -fs ../dbus.socket $(DESTDIR)$(systemduserunitdir)/sockets.target.wants/dbus.socket -endif - -if DBUS_UNIX -if ENABLE_TRADITIONAL_ACTIVATION -install-exec-hook: - if test `id -u` -eq 0; then \ - chown root:$(DBUS_USER) $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \ - chmod 4750 $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper$(EXEEXT); \ - else \ - echo "Not installing $(DESTDIR)$(libexecdir)/dbus-daemon-launch-helper binary setuid!"; \ - echo "You'll need to manually set permissions to root:$(DBUS_USER) and permissions 4750"; \ - fi -endif ENABLE_TRADITIONAL_ACTIVATION -endif DBUS_UNIX - -EXTRA_DIST += \ - dbus.service.in \ - dbus.socket.in \ - legacy-config/meson.build \ - meson.build \ - systemd-user/dbus.service.in \ - systemd-user/dbus.socket.in \ - systemd-user/meson.build \ - sysusers.d/dbus.conf.in \ - sysusers.d/meson.build \ - tmpfiles.d/dbus.conf.in \ - tmpfiles.d/meson.build \ - $(NULL) - -if HAVE_SYSTEMD -systemdsystemunit_DATA = \ - dbus.service \ - dbus.socket - -nodist_systemdsysusers_DATA = \ - sysusers.d/dbus.conf - -nodist_systemdtmpfiles_DATA = \ - tmpfiles.d/dbus.conf \ - $(NULL) -endif - -if DBUS_ENABLE_USER_SESSION -systemduserunit_DATA = \ - systemd-user/dbus.service \ - systemd-user/dbus.socket \ - $(NULL) -endif - -# Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE -include $(top_srcdir)/aminclude_static.am diff --git a/configure.ac b/configure.ac deleted file mode 100644 index e89466d4..00000000 --- a/configure.ac +++ /dev/null @@ -1,1817 +0,0 @@ -dnl -*- mode: m4 -*- -AC_PREREQ([2.63]) - -m4_define([dbus_major_version], [1]) -m4_define([dbus_minor_version], [15]) -m4_define([dbus_micro_version], [9]) -m4_define([dbus_version], - [dbus_major_version.dbus_minor_version.dbus_micro_version]) -AC_INIT([dbus], [dbus_version], [https://gitlab.freedesktop.org/dbus/dbus/issues], [dbus]) - -AC_CONFIG_AUX_DIR([build-aux]) - -m4_pattern_forbid([^AX_(CHECK_ENABLE_DEBUG|CODE_COVERAGE|COMPILER_FLAGS|COMPILER_FLAGS_(CFLAGS|CXXFLAGS|LDFLAGS)|RECURSIVE_EVAL)\b], - [Unexpanded AX_ macro found. Please install GNU autoconf-archive]) - -AC_CANONICAL_HOST - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.13 tar-ustar no-dist-gzip dist-xz -Wno-portability subdir-objects foreign]) - -GETTEXT_PACKAGE=dbus-1 -AC_SUBST(GETTEXT_PACKAGE) -AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext domain]) - -# By default, rebuild autotools files on demand; only use ./missing if the -# user says --disable-maintainer-mode (some distributions like to do this) -AM_MAINTAINER_MODE([enable]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -AC_DEFINE_UNQUOTED(DBUS_DAEMON_NAME,"dbus-daemon",[Name of executable]) - -# libtool versioning - this applies to libdbus -# -# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details -# - -## increment if the interface has additions, changes, removals. -LT_CURRENT=41 - -## increment any time the source changes; set to -## 0 if you increment CURRENT -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=38 - -AC_SUBST(LT_CURRENT) -AC_SUBST(LT_REVISION) -AC_SUBST(LT_AGE) -SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}` -AC_SUBST([SOVERSION]) - -DBUS_MAJOR_VERSION=dbus_major_version -DBUS_MINOR_VERSION=dbus_minor_version -DBUS_MICRO_VERSION=dbus_micro_version -DBUS_VERSION=dbus_major_version.dbus_minor_version.dbus_micro_version - -AC_SUBST(DBUS_MAJOR_VERSION) -AC_SUBST(DBUS_MINOR_VERSION) -AC_SUBST(DBUS_MICRO_VERSION) -AC_SUBST(DBUS_VERSION) - -dnl -dnl Build configuration -dnl - -dnl This must come first: other options use this to set their defaults. Don't -dnl enable developer mode on production builds. -AC_ARG_ENABLE([developer], - [AS_HELP_STRING([--enable-developer], - [set defaults to be appropriate for a D-Bus developer instead of a distribution/end-user])], - [enable_developer=$enableval], - [enable_developer=no]) - -dnl 'disable_developer' is the negation of 'enable_developer'. If -dnl 'enable-developer' is set to 'no' (the default), the value of -dnl 'disable_developer' is set to 'yes', and vice versa. It's used -dnl for macros that require the opposite of 'enable_developer', such -dnl as several AX_ macros. -dnl See https://bugs.freedesktop.org/show_bug.cgi?id=97357 -AS_IF([test "x$enable_developer" = "xyes"],[ - disable_developer=no - ],[ - disable_developer=yes - ]) - -# The debugging check must run before the compiler tests. Other command-line -# options also use it to set their defaults. We disable debugging by default, -# except for developer builds. -AX_CHECK_ENABLE_DEBUG([$enable_developer]) - -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_CXX -AC_USE_SYSTEM_EXTENSIONS -AC_SYS_LARGEFILE -AC_ISC_POSIX -AC_HEADER_STDC -AM_PROG_LIBTOOL -AC_PROG_MKDIR_P -PKG_PROG_PKG_CONFIG - -# TAP test driver support -AC_PROG_AWK -AC_REQUIRE_AUX_FILE([tap-driver.sh]) - -# This must come before we set up compiler warnings because it assumes -# non-use of -Werror=missing-prototypes -gl_VISIBILITY -AM_CONDITIONAL([HAVE_VISIBILITY], [test "x$HAVE_VISIBILITY" = x1]) - -# Initialize libtool -LT_INIT([win32-dll]) -LT_LANG([Windows Resource]) - -# Set some internal variables depending on the platform for later use. -dbus_win=no -dbus_cygwin=no -dbus_unix=no -case "${host}" in - *-mingw32ce*) - dbus_win=yes - dbus_wince=yes - ;; - *-mingw32*) - dbus_win=yes - ;; - *-cygwin*) - dbus_cygwin=yes - dbus_unix=yes - ;; - *) - dbus_unix=yes - ;; -esac - -# Special defines for certain platforms -if test "$dbus_win" = yes; then - AC_DEFINE(DBUS_WIN,1,[Defined if we run on a W32 API based system]) - # Yes, on Windows it really does work like this. - # http://support.microsoft.com/kb/111855 - AC_DEFINE(FD_SETSIZE,8192,[The maximum number of connections that can be handled at once]) - BUILD_TIMESTAMP=`date --iso-8601=minutes` - AC_SUBST(BUILD_TIMESTAMP) - # Assume DBUS_VERSION is always three numbers - BUILD_FILEVERSION=`echo "$DBUS_VERSION" | sed -e 's/\./,/g'`,0 - AC_SUBST(BUILD_FILEVERSION) - # In the CMake build system we generate multiple files, versioninfo-*.rc, with a - # different "internal name" and "original filename", for embedding in multiple - # executables. In the Autotools build system, we currently only generate - # versioninfo.rc and embed it in libdbus-1-${SOVERSION}.dll. - AC_SUBST([DBUS_VER_INTERNAL_NAME], [libdbus-1-${SOVERSION}]) - AC_SUBST([DBUS_VER_ORIGINAL_NAME], [libdbus-1-${SOVERSION}.dll]) - AC_SUBST([DBUS_VER_FILE_TYPE], [VFT_DLL]) - AS_IF([test -z "$RC"], - [AC_MSG_ERROR([An implementation of windres is required])]) - if test "$dbus_wince" = yes; then - AC_DEFINE(DBUS_WINCE,1,[Defined if we run on a W32 CE API based system]) - AC_DEFINE(_WIN32_WCE, 0x0502, [Defined to get newer W32 CE APIs]) - else - AC_DEFINE([_WIN32_WINNT], [0x0600], - [Define to the minimum supported Windows version (0x0600 is Vista)]) - fi -else - AC_DEFINE(DBUS_UNIX,1,[Defined if we run on a Unix-based system]) -fi -if test "$dbus_cygwin" = yes; then - AC_DEFINE(DBUS_CYGWIN,1,[Defined if we run on a cygwin API based system]) -fi - -# For best security, assume that all non-Windows platforms can do -# credentials-passing. -AS_IF([test "$dbus_win" = yes], - [DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL="<!--<auth>EXTERNAL</auth>-->"], - [DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL="<auth>EXTERNAL</auth>"]) -AC_SUBST([DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL]) - -AM_CONDITIONAL(DBUS_WIN, test "$dbus_win" = yes) -AM_CONDITIONAL(DBUS_WINCE, test "$dbus_wince" = yes) -AM_CONDITIONAL(DBUS_UNIX, test "$dbus_unix" = yes) -AM_CONDITIONAL(DBUS_CYGWIN, test "$dbus_cygwin" = yes) - -DBUS_STATIC_BUILD_CPPFLAGS= -if test "x$enable_shared" = xno; then - # On Windows, linking against the static library requires special effort - # to turn off DLL import/export processing. We normally link some things - # against the dynamic library, but if we're not building that, we'll - # have to link everything statically. - DBUS_STATIC_BUILD_CPPFLAGS=-DDBUS_STATIC_BUILD -fi -AC_SUBST([DBUS_STATIC_BUILD_CPPFLAGS]) - -AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) -AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$enable_developer) -AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$enable_developer) -AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes) -AC_ARG_ENABLE(xml-docs, AS_HELP_STRING([--enable-xml-docs],[build XML documentation (requires xmlto)]),enable_xml_docs=$enableval,enable_xml_docs=auto) -AC_ARG_ENABLE(doxygen-docs, AS_HELP_STRING([--enable-doxygen-docs],[build DOXYGEN documentation (requires Doxygen)]),enable_doxygen_docs=$enableval,enable_doxygen_docs=auto) -AC_ARG_ENABLE([ducktype-docs], - AS_HELP_STRING([--enable-ducktype-docs], - [build Ducktype documentation (requires Ducktype)]), - [enable_ducktype_docs=$enableval], [enable_ducktype_docs=auto]) -AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux],[build with SELinux support]),enable_selinux=$enableval,enable_selinux=auto) -AC_ARG_ENABLE([apparmor], - [AS_HELP_STRING([--enable-apparmor], [build with AppArmor support])], - [enable_apparmor=$enableval], - [enable_apparmor=auto]) -AC_ARG_ENABLE(libaudit,AS_HELP_STRING([--enable-libaudit],[build audit daemon support for SELinux]),enable_libaudit=$enableval,enable_libaudit=auto) -AC_ARG_ENABLE(inotify, AS_HELP_STRING([--enable-inotify],[build with inotify support (linux only)]),enable_inotify=$enableval,enable_inotify=auto) -AC_ARG_ENABLE(kqueue, AS_HELP_STRING([--enable-kqueue],[build with kqueue support]),enable_kqueue=$enableval,enable_kqueue=auto) -AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[enable console owner file]),enable_console_owner_file=$enableval,enable_console_owner_file=auto) -AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) -AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) -AC_ARG_ENABLE(traditional-activation, AS_HELP_STRING([--disable-traditional-activation], [Do not build support for service activation without using SystemdService]), enable_traditional_activation="$enableval", enable_traditional_activation=yes) - -AC_ARG_WITH(session-socket-dir, AS_HELP_STRING([--with-session-socket-dir=[dirname]],[Where to put sockets for the per-login-session message bus])) -AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check])) -AC_ARG_WITH(system-pid-file, AS_HELP_STRING([--with-system-pid-file=[pidfile]],[PID file for systemwide daemon])) -AC_ARG_WITH(system-socket, AS_HELP_STRING([--with-system-socket=[filename]],[UNIX domain socket for systemwide daemon])) -AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner])) -AC_ARG_WITH(launchd-agent-dir, AS_HELP_STRING([--with-launchd-agent-dir=[dirname]],[directory to put the launchd agent (default: /Library/LaunchAgents)])) -AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)])) -AC_ARG_WITH([test_user], - [AS_HELP_STRING([--with-test-user=<user>], - [Unprivileged user for regression tests, other than root and the dbus_user (default: nobody)])]) -AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon])) - -AC_ARG_ENABLE([embedded-tests], - AS_HELP_STRING([--enable-embedded-tests], - [enable unit test code in the library and binaries]), - [], [enable_embedded_tests=$enable_developer]) -AC_ARG_ENABLE([modular-tests], - AS_HELP_STRING([--enable-modular-tests], - [enable modular regression tests (requires GLib)]), - [], [enable_modular_tests=auto]) -# --enable-tests overrides both --enable-embedded-tests and -# --enable-modular-tests -AC_ARG_ENABLE([tests], - AS_HELP_STRING([--enable-tests], - [enable/disable all tests, overriding embedded-tests/modular-tests]), - [ - if test "x$enableval" = xyes; then - AC_MSG_NOTICE([Full test coverage was requested with --enable-tests=yes]) - AC_MSG_NOTICE([This requires GLib]) - fi - enable_embedded_tests=$enableval - enable_modular_tests=$enableval - ], - []) - -# DBUS_ENABLE_EMBEDDED_TESTS controls unit tests built in to .c files -# and also some stuff in the test/ subdir. -AM_CONDITIONAL([DBUS_ENABLE_EMBEDDED_TESTS], - [test "x$enable_embedded_tests" = xyes]) -if test "x$enable_embedded_tests" = xyes; then - AC_DEFINE([DBUS_ENABLE_EMBEDDED_TESTS], [1], - [Define to build test code into the library and binaries]) -fi - -# DBUS_ENABLE_MODULAR_TESTS controls tests that work based on public API. -# These use GTest, from GLib, because life's too short. They're enabled by -# default (unless you don't have GLib), because they don't bloat the library -# or binaries. - -dnl Don't do anything too subtle here, because the CMake build system -dnl parses these lines with regular expressions. If necessary, adjust -dnl cmake/modules/MacrosAutotools.cmake to compensate. -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_38], [Ignore post-2.38 deprecations]) -AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [G_ENCODE_VERSION(2,44)], [Prevent post-2.44 APIs]) - -with_glib=yes - -AS_IF([test "x$enable_modular_tests" != xno], - [ - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gio-2.0 >= 2.40], - [ - AS_IF([test "x$dbus_unix" = xyes], - [PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0], - [AC_DEFINE([HAVE_GIO_UNIX], [1], [Define if you have gio-unix-2.0])], [])]) - ], - [if test "x$enable_modular_tests" = xyes; then - AC_MSG_NOTICE([Full test coverage (--enable-modular-tests=yes or --enable-tests=yes) requires GLib]) - AC_MSG_ERROR([$GLIB_ERRORS]) - else # assumed to be "auto" - with_glib=no - fi]) - ], - [with_glib=no]) - -if test "x$enable_modular_tests" != xno; then - AC_DEFINE([DBUS_ENABLE_MODULAR_TESTS], [1], - [Define to build independent test binaries]) -fi -AM_CONDITIONAL([DBUS_ENABLE_MODULAR_TESTS], - [test "x$enable_modular_tests" != xno]) - -if test "x$with_glib" != xno; then - AC_DEFINE([DBUS_WITH_GLIB], [1], - [Define if GLib, GObject, GIO are available]) -fi -AM_CONDITIONAL([DBUS_WITH_GLIB], [test "x$with_glib" != xno]) - -AC_ARG_ENABLE([installed-tests], - AS_HELP_STRING([--enable-installed-tests], - [enable unit test code in the library and binaries]), - [], [enable_installed_tests=no]) -AM_CONDITIONAL([DBUS_ENABLE_INSTALLED_TESTS], - [test "x$enable_installed_tests" = xyes]) - -if test x$enable_verbose_mode = xyes; then - AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode]) -fi - -dnl Intentional: -dnl - $DISABLE_WARNINGS disables unused-label warnings if not -dnl checking or not asserting (tested further below) -dnl - missing field initializers being 0 is a C feature, not a bug -dnl - unused-parameter is to make writing callbacks less annoying -DISABLE_WARNINGS="$DISABLE_WARNINGS - -Wno-missing-field-initializers - -Wno-unused-parameter" - -if test x$enable_asserts = xno; then - AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking]) - DISABLE_WARNINGS="$DISABLE_WARNINGS -Wno-unused-label" - R_DYNAMIC_LDFLAG="" - if test x$enable_embedded_tests = xyes; then - DISABLE_WARNINGS="$DISABLE_WARNINGS - -Wno-unused-but-set-variable - -Wno-unused-variable - -Wno-unused-function" - fi -else - # -rdynamic is needed for glibc's backtrace_symbols to work. - # No clue how much overhead this adds, but it's useful - # to do this on any assertion failure, - # so for now it's enabled anytime asserts are (currently not - # in production builds). - - # To get -rdynamic you pass -export-dynamic to libtool. - AC_DEFINE(DBUS_BUILT_R_DYNAMIC,1,[whether -export-dynamic was passed to libtool]) - R_DYNAMIC_LDFLAG=-export-dynamic -fi -AC_SUBST(R_DYNAMIC_LDFLAG) - -if test x$enable_checks = xno; then - AC_DEFINE(DBUS_DISABLE_CHECKS,1,[Disable public API sanity checking]) - AC_DEFINE(G_DISABLE_CHECKS,1,[Disable GLib public API sanity checking]) - DISABLE_WARNINGS="$DISABLE_WARNINGS -Wno-unused-label" -fi - -AH_BOTTOM([ -/* explicitly define these macros to get less confusing conditions */ -#ifndef DBUS_DISABLE_ASSERT -# define DBUS_ENABLE_ASSERT 1 -#endif -#ifndef DBUS_DISABLE_CHECKS -# define DBUS_ENABLE_CHECKS 1 -#endif]) - -# Test for code-coverage tools if --enable-code-coverage -AX_CODE_COVERAGE - -AS_IF([test x$enable_code_coverage = xyes],[ - AC_DEFINE_UNQUOTED( - [DBUS_GCOV_ENABLED], [1], - [Defined if gcov is enabled to force a rebuild due to config.h changing]) - ]) - -#### Simple checks for things with no special dependencies - -# This construct is only suitable for functions that are in the system's -# standard C library and do not have unusual dependencies. Other -# functions need their own checks. Please keep sorted in LC_ALL=C order -AC_CHECK_FUNCS_ONCE([ -accept4 -clearenv -close_range -closefrom -fpathconf -getgrouplist -getpeereid -getpeerucred -getrandom -getresuid -getrlimit -inotify_init1 -issetugid -localeconv -nanosleep -pipe2 -poll -prctl -prlimit -raise -setenv -setlocale -setresuid -setrlimit -socketpair -unsetenv -usleep -]) - -# This construct is only suitable for headers that are self-contained -# and do not require extra headers to be included first. More complex -# headers need their own checks. Please keep sorted in LC_ALL=C order -AC_CHECK_HEADERS_ONCE([ -alloca.h -byteswap.h -crt_externs.h -dirent.h -errno.h -linux/close_range.h -locale.h -signal.h -stdatomic.h -sys/prctl.h -sys/random.h -sys/resource.h -sys/syscall.h -sys/time.h -unistd.h -winsock2.h -ws2tcpip.h -]) - -#### Pointer size -AC_CHECK_SIZEOF(void *) -DBUS_SIZEOF_VOID_P=$ac_cv_sizeof_void_p -AC_SUBST(DBUS_SIZEOF_VOID_P) - -#### Integer sizes - -AC_CHECK_SIZEOF(char) -AC_CHECK_SIZEOF(short) -AC_CHECK_SIZEOF(long) -AC_CHECK_SIZEOF(int) -AC_CHECK_SIZEOF(long long) -AC_CHECK_SIZEOF(__int64) - -### See what our 64 bit type is called -AC_MSG_CHECKING([64-bit integer type]) - -case 8 in -$ac_cv_sizeof_int) - dbusint64=int - dbusint64_constant='(val)' - dbusuint64_constant='(val)' - dbusint64_modifier="" - ;; -$ac_cv_sizeof_long) - dbusint64=long - dbusint64_constant='(val##L)' - dbusuint64_constant='(val##UL)' - dbusint64_modifier="l" - ;; -$ac_cv_sizeof_long_long) - dbusint64='long long' - dbusint64_constant='(val##LL)' - dbusuint64_constant='(val##ULL)' - dbusint64_modifier="ll" - ;; -$ac_cv_sizeof___int64) - dbusint64=__int64 - dbusint64_constant='(val##i64)' - dbusuint64_constant='(val##ui64)' - dbusint64_modifier="I64" - ;; -esac - -# MSVCRT.dll printf() doesn't support %lld -AS_IF([test "$dbus_win" = yes], [dbusint64_modifier="I64"]) - -AS_IF( - [test -z "$dbusint64"], - [AC_MSG_RESULT([not found]) - AC_MSG_ERROR([Could not find a 64-bit integer type. - -Please report a bug here with details of your platform and compiler: - - http://bugs.freedesktop.org/enter_bug.cgi?product=DBus&component=core]) - ], - dnl else - [ - DBUS_INT64_TYPE="$dbusint64" - DBUS_INT64_CONSTANT="$dbusint64_constant" - DBUS_UINT64_CONSTANT="$dbusuint64_constant" - DBUS_INT64_MODIFIER="$dbusint64_modifier" - AC_MSG_RESULT($DBUS_INT64_TYPE) - ]) - -AC_SUBST(DBUS_INT64_TYPE) -AC_SUBST(DBUS_INT64_CONSTANT) -AC_SUBST(DBUS_UINT64_CONSTANT) -AC_SUBST(DBUS_INT64_MODIFIER) - -### see what 32-bit int is called -AC_MSG_CHECKING([32-bit integer type]) - -case 4 in -$ac_cv_sizeof_short) - dbusint32=short - ;; -$ac_cv_sizeof_int) - dbusint32=int - ;; -$ac_cv_sizeof_long) - dbusint32=long - ;; -esac - -if test -z "$dbusint32" ; then - DBUS_INT32_TYPE="no_int32_type_detected" - AC_MSG_ERROR([No 32-bit integer type found]) -else - DBUS_INT32_TYPE="$dbusint32" - AC_MSG_RESULT($DBUS_INT32_TYPE) -fi - -AC_SUBST(DBUS_INT32_TYPE) - -### see what 16-bit int is called -AC_MSG_CHECKING([16-bit integer type]) - -case 2 in -$ac_cv_sizeof_short) - dbusint16=short - ;; -$ac_cv_sizeof_int) - dbusint16=int - ;; -esac - -if test -z "$dbusint16" ; then - DBUS_INT16_TYPE="no_int16_type_detected" - AC_MSG_ERROR([No 16-bit integer type found]) -else - DBUS_INT16_TYPE="$dbusint16" - AC_MSG_RESULT($DBUS_INT16_TYPE) -fi - -AC_SUBST(DBUS_INT16_TYPE) - -# Opt-in to large timestamp support, which we know doesn't break libdbus ABI: -# https://gitlab.freedesktop.org/dbus/dbus/-/issues/465 -# Currently we only know how to do this for GNU libc. -AC_CHECK_DECL( - [__GLIBC__], [ - AC_CHECK_DECL( - [_TIME_BITS], - [time_bits_defined=yes], - [time_bits_defined=no], - [[#include <time.h>]] - ) - ], - [], - [[#include <time.h>]] -) -AS_IF( - [test "$time_bits_defined" = no && test "$DBUS_SIZEOF_VOID_P" = 4], - [ - AC_DEFINE( - [_TIME_BITS], [64], - [Define to 64 if using 32-bit glibc and not already defined] - ) - ] -) - -## byte order -case $host_os in - darwin*) - # check at compile-time, so that it is possible to build universal - # (with multiple architectures at once on the compile line) - AH_VERBATIM([WORDS_BIGENDIAN_DARWIN], [ - /* Use the compiler-provided endianness defines to allow universal compiling. */ - #if defined(__BIG_ENDIAN__) - #define WORDS_BIGENDIAN 1 - #endif - ]) - ;; - *) - AC_C_BIGENDIAN - ;; -esac - -# As a GNU extension, glibc declares environ in unistd.h, which is one of -# the AC_INCLUDES_DEFAULT. -AC_CHECK_DECLS([environ]) - -#### Atomic integers - -AC_CACHE_CHECK([whether $CC knows __sync_sub_and_fetch()], - dbus_cv_sync_sub_and_fetch, - [AC_LINK_IFELSE([ - AC_LANG_PROGRAM([[]], [[int a = 4; int b = __sync_sub_and_fetch(&a, 4); return b; ]])], - [dbus_cv_sync_sub_and_fetch=yes], - [dbus_cv_sync_sub_and_fetch=no]) - ]) - -if test "x$dbus_cv_sync_sub_and_fetch" = "xyes" ; then - have_sync=1 -else - have_sync=0 -fi - -AC_DEFINE_UNQUOTED([DBUS_USE_SYNC], [$have_sync], [Use the gcc __sync extension]) - -#### Various functions -AC_SEARCH_LIBS(socket,[socket network]) -AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) - -AC_CHECK_HEADERS([syslog.h]) -if test "x$ac_cv_header_syslog_h" = "xyes"; then - AC_CHECK_DECLS([LOG_PERROR], [], [], [[#include <syslog.h>]]) -fi - -AC_CHECK_HEADERS([execinfo.h], - [AC_SEARCH_LIBS([backtrace], [execinfo], - [AC_DEFINE([HAVE_BACKTRACE], [1], - [Define to 1 if you have backtrace().])])]) - -# Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris -# -case $host_os in - solaris*) - CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" ;; -esac - -AC_CHECK_FUNCS_ONCE([getpwnam_r]) - -dnl check for socklen_t -AC_MSG_CHECKING(whether socklen_t is defined) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/socket.h> -#include <netdb.h> -]], [[ -socklen_t foo; -foo = 1; -]])], -[dbus_have_socklen_t=yes], -[dbus_have_socklen_t=no]) -AC_MSG_RESULT($dbus_have_socklen_t) - -if test "x$dbus_have_socklen_t" = "xyes"; then - AC_DEFINE(HAVE_SOCKLEN_T,1,[Have socklen_t type]) -fi - -dnl check for writev header and writev function so we're -dnl good to go if HAVE_WRITEV gets defined. -AC_CHECK_HEADERS(sys/uio.h, [AC_CHECK_FUNCS(writev)]) - -dnl Make it easy to check if we have MSG_NOSIGNAL without actually having to include sys/socket.h -AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include <sys/types.h> -#include <sys/socket.h> ]]) - -dnl Check for various credentials. -AC_MSG_CHECKING(for struct cmsgcred) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/socket.h> -]], [[ -struct cmsgcred cred; - -cred.cmcred_pid = 0; -]])], -[dbus_have_struct_cmsgcred=yes], -[dbus_have_struct_cmsgcred=no]) -AC_MSG_RESULT($dbus_have_struct_cmsgcred) - -if test x$dbus_have_struct_cmsgcred = xyes; then - AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) -fi - -AC_CHECK_MEMBER([struct unpcbid.unp_pid], - [AC_DEFINE([HAVE_UNPCBID], 1, [Have unpcbid structure])], - [], - [[#include <sys/un.h>]]) - -PKG_CHECK_MODULES([EXPAT], [expat]) - -save_cflags="$CFLAGS" -save_libs="$LIBS" -CFLAGS="$CFLAGS $EXPAT_CFLAGS" -LIBS="$LIBS $EXPAT_LIBS" -AC_CHECK_FUNCS([XML_SetHashSalt]) -CFLAGS="$save_cflags" -LIBS="$save_libs" - -# Thread lib detection -AC_ARG_VAR([THREAD_LIBS]) -save_libs="$LIBS" -LIBS="$LIBS $THREAD_LIBS" - -is_missing_pthread_function="is required when compiling D-Bus on Unix platforms, but is not in your libc or libpthread. Please open a bug on https://gitlab.freedesktop.org/dbus/dbus/-/issues/new with details of your platform." - -# Don't do these automatic checks if the user set THREAD_LIBS on the -# configure command-line. If they did, we assume they're right. -# -# We also don't do these checks on Windows, because you don't need magical -# linker flags to have threading support there. -AS_IF([test "x$dbus_unix" = xyes && test "x$THREAD_LIBS" = x], - [ - # Mandatory pthread functions. In principle, some of these could be made - # optional if there are platforms that don't have them. - # - # Currently, we only look in -lpthread. - # In principle we might need to look in -lpthreads, -lthreads, ... - # as well - please file a bug if your platform needs this. - AC_SEARCH_LIBS([pthread_cond_timedwait], - [pthread], - [THREAD_LIBS="$LIBS"], - [AC_MSG_ERROR([pthread_cond_timedwait $is_missing_pthread_function])], - []) - AC_SEARCH_LIBS([pthread_mutexattr_init], - [pthread], - [THREAD_LIBS="$LIBS"], - [AC_MSG_ERROR([pthread_mutexattr_init $is_missing_pthread_function])], - []) - AC_SEARCH_LIBS([pthread_mutexattr_settype], - [pthread], - [THREAD_LIBS="$LIBS"], - [AC_MSG_ERROR([pthread_mutexattr_settype $is_missing_pthread_function])], - []) - - # Optional, for monotonic clocks. Because it's optional, this check - # is non-fatal if we don't find it. - AC_SEARCH_LIBS([pthread_condattr_setclock], - [pthread], - [THREAD_LIBS="$LIBS"]) - - AS_IF([test "x$ac_cv_search_pthread_condattr_setclock" != xno], - [ - AC_SEARCH_LIBS([clock_getres], [rt], [THREAD_LIBS="$LIBS"]) - AC_MSG_CHECKING([for CLOCK_MONOTONIC]) - AC_COMPILE_IFELSE([AC_LANG_PROGRAM( -[[#include <time.h> -#include <pthread.h> -]], [[ -struct timespec monotonic_timer; -pthread_condattr_t attr; -pthread_condattr_init (&attr); -pthread_condattr_setclock (&attr, CLOCK_MONOTONIC); -clock_getres (CLOCK_MONOTONIC,&monotonic_timer); -]])], - [have_clock_monotonic=true], - [have_clock_monotonic=false]) - AS_IF([test x$have_clock_monotonic = xtrue], - [ - AC_MSG_RESULT([found]) - AC_DEFINE(HAVE_MONOTONIC_CLOCK, 1, [Define if we have CLOCK_MONOTONIC]) - ], - [AC_MSG_RESULT([not found])]) - ]) dnl have pthread_condattr_setclock - ]) dnl on Unix - -LIBS="$save_libs" - -AC_SUBST([THREAD_LIBS]) - -# SELinux detection -if test x$enable_selinux = xno ; then - have_selinux=no; -else - # See if we have SELinux library - PKG_CHECK_MODULES([SELINUX], [libselinux >= 2.0.86], - [have_selinux=yes], [have_selinux=no]) - - if test x$enable_selinux = xauto ; then - if test x$have_selinux = xno ; then - AC_MSG_WARN([Sufficiently new SELinux library not found]) - fi - else - if test x$have_selinux = xno ; then - AC_MSG_ERROR([SElinux explicitly required, and SELinux library not found]) - fi - fi -fi - -AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes) - -if test x$have_selinux = xyes ; then - # the selinux code creates threads - # which requires libpthread even on linux - AC_CHECK_FUNC(pthread_create,,[AC_CHECK_LIB(pthread,pthread_create, - [SELINUX_THREAD_LIBS="-lpthread"])]) - - SELINUX_LIBS="$SELINUX_LIBS $SELINUX_THREAD_LIBS" - AC_DEFINE(HAVE_SELINUX,1,[SELinux support]) -else - SELINUX_LIBS= -fi - -# AppArmor detection -AS_IF([test x$enable_apparmor = xno], - [have_apparmor=no], - [ - PKG_CHECK_MODULES([APPARMOR], [libapparmor >= 2.8.95], - [have_apparmor=yes], [have_apparmor=no]) - PKG_CHECK_MODULES([APPARMOR_2_10], [libapparmor >= 2.10], - [have_apparmor_2_10=yes], [have_apparmor_2_10=no]) - - AS_IF([test x$enable_apparmor = xauto && test x$have_apparmor = xno], - [AC_MSG_WARN([Sufficiently new AppArmor library not found])]) - AS_IF([test x$enable_apparmor != xauto && test x$have_apparmor = xno], - [AC_MSG_ERROR([AppArmor explicitly required, and AppArmor library not found])]) - ]) - -AS_IF([test x$have_apparmor = xyes], - [AC_DEFINE([HAVE_APPARMOR], [1], [AppArmor Support])]) -AS_IF([test x$have_apparmor_2_10 = xyes], - [AC_DEFINE([HAVE_APPARMOR_2_10], [1], - [Define if libapparmor is version 2.10 or later])]) - -# inotify checks -if test x$enable_inotify = xno ; then - have_inotify=no; -else - AC_CHECK_HEADERS(sys/inotify.h, have_inotify=yes, have_inotify=no) -fi - -dnl check if inotify backend is enabled -if test x$have_inotify = xyes; then - AC_DEFINE(DBUS_BUS_ENABLE_INOTIFY,1,[Use inotify]) -fi - -AM_CONDITIONAL(DBUS_BUS_ENABLE_INOTIFY, test x$have_inotify = xyes) - -# For simplicity, we require the userland API for epoll_create1 at -# compile-time (glibc 2.9), but we'll run on kernels that turn out -# not to have it at runtime. -AC_ARG_ENABLE([epoll], - [AS_HELP_STRING([--enable-epoll],[use epoll(4) on Linux])], - [enable_epoll=$enableval], [enable_epoll=auto]) -if test x$enable_epoll = xno; then - have_linux_epoll=no -else - AC_MSG_CHECKING([for Linux epoll(4)]) - AC_LINK_IFELSE([AC_LANG_PROGRAM( - [ - #ifndef __linux__ - #error This is not Linux - #endif - #include <sys/epoll.h> - ], - [epoll_create1 (EPOLL_CLOEXEC);])], - [have_linux_epoll=yes], - [have_linux_epoll=no]) - AC_MSG_RESULT([$have_linux_epoll]) -fi -if test x$enable_epoll,$have_linux_epoll = xyes,no; then - AC_MSG_ERROR([epoll support explicitly enabled but not available]) -fi -if test x$have_linux_epoll = xyes; then - AC_DEFINE([DBUS_HAVE_LINUX_EPOLL], 1, [Define to use epoll(4) on Linux]) -fi -AM_CONDITIONAL([DBUS_HAVE_LINUX_EPOLL], [test x$have_linux_epoll = xyes]) - -# kqueue checks -if test x$enable_kqueue = xno ; then - have_kqueue=no -else - have_kqueue=yes - AC_CHECK_HEADER(sys/event.h, , have_kqueue=no) - AC_CHECK_FUNC(kqueue, , have_kqueue=no) - - if test x$enable_kqueue = xyes -a x$have_kqueue = xno; then - AC_MSG_ERROR(kqueue support explicitly enabled but not available) - fi -fi - -dnl check if kqueue backend is enabled -if test x$have_kqueue = xyes; then - AC_DEFINE(DBUS_BUS_ENABLE_KQUEUE,1,[Use kqueue]) -fi - -AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE, test x$have_kqueue = xyes) - -# launchd checks -if test x$enable_launchd = xno ; then - have_launchd=no -else - have_launchd=yes - AC_CHECK_HEADER([launch.h], , have_launchd=no) - AC_PATH_PROG([LAUNCHCTL], [launchctl]) - if test "x$LAUNCHCTL" = "x"; then - have_launchd=no - fi - - if test x$enable_launchd = xyes && test x$have_launchd = xno ; then - AC_MSG_ERROR([launchd support explicitly enabled but not available]) - fi -fi - -dnl check if launchd is enabled -if test x$have_launchd = xyes; then - AC_DEFINE(DBUS_ENABLE_LAUNCHD,1,[Use launchd autolaunch]) -fi - -AM_CONDITIONAL(DBUS_ENABLE_LAUNCHD, test x$have_launchd = xyes) - -#### Directory to place launchd agent file -if test "x$with_launchd_agent_dir" = "x"; then - LAUNCHD_AGENT_DIR="/Library/LaunchAgents" -else - LAUNCHD_AGENT_DIR="$with_launchd_agent_dir" -fi - -AC_SUBST(LAUNCHD_AGENT_DIR) - -dnl console owner file -if test x$enable_console_owner_file = xno ; then - have_console_owner_file=no; -else - case $host_os in - solaris*) - have_console_owner_file=yes; - AC_DEFINE(HAVE_CONSOLE_OWNER_FILE,1,[Have console owner file]) - ;; - *) - have_console_owner_file=no;; - esac -fi - -AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes) - -dnl systemd detection -if test x$enable_systemd = xno ; then - have_systemd=no; -else - PKG_CHECK_MODULES([SYSTEMD], - [libsystemd >= 209], - [have_systemd=yes], - [PKG_CHECK_MODULES([SYSTEMD], - [libsystemd-login >= 32, libsystemd-daemon >= 32, libsystemd-journal >= 32], - [have_systemd=yes], - [have_systemd=no])]) -fi - -if test x$have_systemd = xyes; then - AC_DEFINE(HAVE_SYSTEMD,1,[Have systemd]) -fi - -if test x$enable_systemd = xyes -a x$have_systemd != xyes ; then - AC_MSG_ERROR([Explicitly requested systemd support, but systemd not found]) -fi - -AS_IF([test "x$enable_traditional_activation" = xyes], - AC_DEFINE(ENABLE_TRADITIONAL_ACTIVATION,[1], [Enable traditional activation without using systemd]) - AS_IF([test "x$enable_systemd" = xno], - AC_MSG_WARN([Traditional activation and systemd activation are both disabled, so service activation (automatically starting services that receive messages) will not work]))) - -AM_CONDITIONAL(ENABLE_TRADITIONAL_ACTIVATION, test x$enable_traditional_activation = xyes) - -# If not found in $PATH, we might still have systemd and systemctl at runtime -# (perhaps dbus is being compiled in a minimal chroot with no systemd). -# Assume the upstream-recommended location. Distributors with split /usr -# can override this with ./configure SYSTEMCTL=/bin/systemctl -AC_PATH_PROG([SYSTEMCTL], [systemctl], [/usr/bin/systemctl]) - -# libaudit detection -if test x$enable_libaudit = xno ; then - have_libaudit=no; -else - # See if we have audit daemon & capabilities library - AC_CHECK_LIB(audit, audit_log_user_avc_message, - have_libaudit=yes, have_libaudit=no) - if test x$have_libaudit = xyes ; then - AC_CHECK_LIB(cap-ng, capng_clear, - have_libaudit=yes, have_libaudit=no) - fi -fi - -AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes) - -if test x$have_libaudit = xyes ; then - SELINUX_LIBS="$SELINUX_LIBS -laudit -lcap-ng" - AC_DEFINE(HAVE_LIBAUDIT,1,[audit daemon SELinux support]) - # For the systemd system unit - AMBIENT_CAPS="AmbientCapabilities=CAP_AUDIT_WRITE" - AC_SUBST(AMBIENT_CAPS) -fi - -AC_SUBST([SELINUX_LIBS]) - -# Check for ADT API (Solaris Basic Security Mode auditing) -AC_MSG_CHECKING(for ADT API) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <bsm/adt.h> -adt_user_context = ADT_USER; -]], [[]])], [ check_adt_audit=yes ], [ check_adt_audit=no ]) - -if test ${check_adt_audit} = yes -then - AC_DEFINE([HAVE_ADT], [], [Adt audit API]) - ADT_LIBS="-lbsm" - LIBS="-lbsm $LIBS" - AC_MSG_RESULT(yes) -else - AC_MSG_RESULT(no) -fi -AC_SUBST([ADT_LIBS]) - -# Check for SCM_RIGHTS -AC_MSG_CHECKING([for SCM_RIGHTS]) -AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -#include <sys/types.h> -#include <sys/socket.h> -#include <sys/un.h> -static int x = SCM_RIGHTS; -]], [[]])], -[ AC_MSG_RESULT([supported]) - AC_DEFINE([HAVE_UNIX_FD_PASSING], [1], [Supports sending UNIX file descriptors]) ], -[ AC_MSG_RESULT([not supported]) ]) - -NETWORK_libs= -if test x$dbus_win = xyes ; then - if test x$dbus_wince = xyes ; then - NETWORK_libs="-lws2" - else - NETWORK_libs="-lws2_32 -liphlpapi -ldbghelp" - fi -fi - -AC_CHECK_HEADERS([afunix.h], [], [], - [AC_INCLUDES_DEFAULT[ - #ifdef HAVE_WINSOCK2_H - # include <winsock2.h> - #endif - ]]) - -AC_SUBST([NETWORK_libs]) - -AC_ARG_WITH([valgrind], - [AS_HELP_STRING([--with-valgrind], - [Add instrumentation to help valgrind to understand our allocator])], - [], - [with_valgrind=no]) - -AS_IF([test "x$with_valgrind" = xauto], - [PKG_CHECK_EXISTS([valgrind >= 3.6], - [with_valgrind=yes], [with_valgrind=no])]) - -if test x$with_valgrind != xno; then - PKG_CHECK_MODULES([VALGRIND], [valgrind >= 3.6]) - AC_DEFINE([WITH_VALGRIND], [1], [Define to add Valgrind instrumentation]) -fi - -AC_CHECK_HEADERS(sys/vfs.h, [AC_CHECK_FUNCS(fstatfs)]) -AC_CHECK_HEADERS([linux/magic.h]) - -AC_CHECK_DECLS([SYS_pidfd_open], [], [], [[ #include <sys/syscall.h> ]]) - -#### Set up final flags -LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $SYSTEMD_LIBS" -AC_SUBST([LIBDBUS_LIBS]) - -### X11 detection -DBUS_X_LIBS= -DBUS_X_CFLAGS= - -AC_ARG_WITH([x], - [AS_HELP_STRING([--without-x], [build without X11 support])], - [], [with_x=auto]) - -AC_ARG_ENABLE([x11-autolaunch], - AS_HELP_STRING([--enable-x11-autolaunch], [build with X11 auto-launch support]), - [], [enable_x11_autolaunch=auto]) - -AS_IF([test "x$dbus_win" = xyes], [ - AS_IF([test "x$enable_x11_autolaunch" = xyes], [ - AC_MSG_ERROR([X11 auto-launch is not supported on Windows]) - ]) - - enable_x11_autolaunch=no - have_x11=no -], [test "x$with_x" != xno], [ - PKG_CHECK_MODULES([X], [x11], - [AC_DEFINE([HAVE_X11], [1], [Define to 1 if you have X11 library]) - have_x11=yes - DBUS_X_LIBS="$X_LIBS" - DBUS_X_CFLAGS="$X_CFLAGS" - ], [ - AS_IF([test "x$with_x" = xyes], - [AC_MSG_ERROR([Couldn't find X11, tried with pkg-config.])], - [AC_MSG_WARN([Couldn't find X11, tried with pkg-config.])] - ) - have_x11=no - ]) -], [ - have_x11=no - AS_IF([test "x$enable_x11_autolaunch" = "xyes"], [ - AC_MSG_ERROR([--enable-x11-autolaunch and --without-x are not compatible]) - ]) -]) - -if test "x$enable_x11_autolaunch,$have_x11" = xyes,no; then - AC_MSG_ERROR([X11 auto-launch requires X headers/libraries]) -else - # move from "auto" to "yes" or "no" if necessary - if test "x$enable_x11_autolaunch" != xno; then - enable_x11_autolaunch="$have_x11" - fi -fi - -if test "x$have_x11" = xyes ; then - AC_DEFINE([DBUS_BUILD_X11], [1], [Define to build X11 functionality]) -fi - -if test "x$enable_x11_autolaunch" = xyes ; then - AC_DEFINE([DBUS_ENABLE_X11_AUTOLAUNCH], [1], [Define to enable X11 auto-launch]) -fi -AM_CONDITIONAL([DBUS_ENABLE_X11_AUTOLAUNCH], - [test "x$enable_x11_autolaunch" = xyes]) - -AC_SUBST([DBUS_X_CFLAGS]) -AC_SUBST([DBUS_X_LIBS]) - -# We're treating -fno-common like a warning: it makes the linker more -# strict, because on some systems the linker is *always* this strict -TEST_CFLAGS="$TEST_CFLAGS -fno-common" - -AS_IF([test "x$enable_ansi" = "xyes"],[ - TEST_CFLAGS="$TEST_CFLAGS -ansi -pedantic" - AC_DEFINE([_POSIX_C_SOURCE],[199309L],[Define to enable POSIX features]) - AC_DEFINE([_BSD_SOURCE],[1],[Define to enable BSD features]) - ]) - -dnl We are only calling this for its side-effect of setting up -dnl --enable-compile-warnings; the WARN_CFLAGS, etc. are ignored, -dnl to work around https://github.com/peti/autoconf-archive/pull/96 -AX_COMPILER_FLAGS([], [], [$disable_developer]) - -dnl Work around https://github.com/peti/autoconf-archive/pull/96 by using -dnl a non-default variable name here (in particular there is no way to tell -dnl AX_COMPILER_FLAGS to not use WARN_CXXFLAGS) -AX_COMPILER_FLAGS_CFLAGS([EXTRA_CFLAGS], - [$disable_developer], - [$TEST_CFLAGS], - [-Wchar-subscripts \ - -Wfloat-equal \ - -Wpointer-sign \ - $DISABLE_WARNINGS]) -dnl cc1plus: warning: command line option ‘-Wpointer-sign’ is valid for -dnl C/ObjC but not for C++ -AX_COMPILER_FLAGS_CXXFLAGS([EXTRA_CXXFLAGS], - [$disable_developer], - [], - [-Wchar-subscripts \ - -Wfloat-equal \ - $DISABLE_WARNINGS]) -AX_COMPILER_FLAGS_LDFLAGS([EXTRA_LDFLAGS], - [$disable_developer]) - -dnl TODO: In principle we should put EXTRA_CFLAGS in each Makefile.am like -dnl telepathy-glib does, since CFLAGS is meant to be reserved for the user... -dnl but prepending to CFLAGS (so the user can override it with later CFLAGS) -dnl is the next best thing. -CFLAGS="$EXTRA_CFLAGS $CFLAGS" -CXXFLAGS="$EXTRA_CXXFLAGS $CXXFLAGS" -LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS" - -AC_ARG_VAR([SANITIZE_CFLAGS], - [Extra CFLAGS for modules that are instrumented for error-checking]) - -case $host_os in - solaris*) - # Solaris' C library apparently needs these runes to be threadsafe... - CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT" - # ... this opt-in to get sockaddr_in6 and sockaddr_storage... - CFLAGS="$CFLAGS -D__EXTENSIONS__" - # ... and this opt-in to get file descriptor passing support - CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500" - ;; -esac - -### Detect if ld supports --version-script - -gl_LD_VERSION_SCRIPT -AM_CONDITIONAL([HAVE_LD_VERSION_SCRIPT], - [test "x$have_ld_version_script" = xyes]) -### Doxygen Documentation - -AC_PATH_PROG(DOXYGEN, doxygen, no) - -AC_MSG_CHECKING([whether to build Doxygen documentation]) - -if test x$DOXYGEN = xno ; then - have_doxygen=no -else - have_doxygen=yes -fi - -if test x$enable_doxygen_docs = xauto ; then - if test x$have_doxygen = xno ; then - enable_doxygen_docs=no - else - enable_doxygen_docs=yes - fi -fi - -if test x$enable_doxygen_docs = xyes; then - if test x$have_doxygen = xno; then - AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found]) - fi -fi - -if test x$dbus_win = xno; then - DBUS_GENERATE_MAN=YES -else - DBUS_GENERATE_MAN=NO -fi -AC_SUBST([DBUS_GENERATE_MAN]) - -AM_CONDITIONAL(DBUS_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes) -AC_MSG_RESULT($enable_doxygen_docs) - -AC_ARG_WITH([qchdir], - AS_HELP_STRING([--with-qchdir=DIR], [Directory for installing Qt help file]), - [qchdir=$withval], - [qchdir="$docdir"]) -AC_SUBST([qchdir]) - -AC_ARG_ENABLE([qt-help], - [AS_HELP_STRING([--enable-qt-help=auto|yes|no], [Build Qt help documentation])], - [], - [enable_qt_help=auto]) -AS_IF([test "x$enable_qt_help" != xno], - [AC_CHECK_PROGS([QHELPGENERATOR], [qhelpgenerator qhelpgenerator-qt5])], - [QHELPGENERATOR=]) -AS_IF([test "x$QHELPGENERATOR" = x && test "x$enable_qt_help" != xno && test "x$enable_qt_help" != xauto], - [AC_MSG_ERROR([Building of Qt help requested, but qhelpgenerator not found])]) - -AC_MSG_CHECKING([whether to build Qt help documentation]) -AS_IF([test "x$enable_doxygen_docs" = xyes && test "x$QHELPGENERATOR" != x], [ - enable_qthelp_docs=yes - DOXYGEN_GENERATE_QHP=YES - DOXYGEN_QHG_LOCATION="$QHELPGENERATOR" - DOXYGEN_QCH_FILE="$(pwd)/doc/api/qch/dbus-$VERSION.qch" - ], [ - DOXYGEN_GENERATE_QHP=NO - enable_qthelp_docs=no - ]) -AC_SUBST([DOXYGEN_GENERATE_QHP]) -AC_SUBST([DOXYGEN_QHG_LOCATION]) -AC_SUBST([DOXYGEN_QCH_FILE]) - -AM_CONDITIONAL([DBUS_QTHELP_DOCS_ENABLED], [test "x$enable_qthelp_docs" = xyes]) -AC_MSG_RESULT($enable_qthelp_docs) - -AC_CHECK_PROGS([XSLTPROC], [xsltproc]) -AM_CONDITIONAL([DBUS_HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) - -### Ducktype/Yelp documentation - -AC_PATH_PROG([DUCKTYPE],[ducktype],[no]) -AC_PATH_PROG([YELP_BUILD],[yelp-build],[no]) - -AC_MSG_CHECKING([whether to build Ducktype documentation]) - -AS_IF([test "$DUCKTYPE" = "no"],[have_ducktype=no],[have_ducktype=yes]) -AS_IF([test "$YELP_BUILD" = "no"],[have_yelp_build=no],[have_yelp_build=yes]) - -AS_IF([test "$enable_ducktype_docs" = "auto"],[ - AS_IF([test "$have_ducktype" = "no" || test "$have_yelp_build" = "no"],[ - enable_ducktype_docs=no - ],[ - enable_ducktype_docs=yes - ]) -]) - -AS_IF([test "$enable_ducktype_docs" = "yes"],[ - AS_IF([test "$have_ducktype" = "no"],[ - AC_MSG_ERROR([Building Ducktype docs explicitly required, but ducktype not found]) - ]) - AS_IF([test "$have_yelp_build" = "no"],[ - AC_MSG_ERROR([Building Ducktype docs explicitly required, but yelp-build not found]) - ]) -]) - -AM_CONDITIONAL([DBUS_DUCKTYPE_DOCS_ENABLED],[test "$enable_ducktype_docs" = "yes"]) -AC_MSG_RESULT([$enable_ducktype_docs]) - -### XML Documentation - -AC_PATH_PROG(XMLTO, xmlto, no) - -AC_MSG_CHECKING([whether to build XML documentation]) - -if test x$XMLTO = xno ; then - have_xmlto=no -else - have_xmlto=yes -fi - -if test x$enable_xml_docs = xauto ; then - if test x$have_xmlto = xno ; then - enable_xml_docs=no - else - enable_xml_docs=yes - fi -fi - -if test x$enable_xml_docs = xyes; then - if test x$have_xmlto = xno; then - AC_MSG_ERROR([Building XML docs explicitly required, but xmlto not found]) - fi -fi - -AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes) -AC_MSG_RESULT($enable_xml_docs) - -AM_CONDITIONAL(DBUS_CAN_UPLOAD_DOCS, - [test x$enable_doxygen_docs = xyes && test x$enable_xml_docs = xyes && - test x$enable_ducktype_docs = xyes]) - -# Autoconf 2.70 supports this, and many distros patched this option in -# before Autoconf 2.70 was released -AS_IF([test -z "${runstatedir}"], [runstatedir='${localstatedir}/run']) -AC_SUBST([runstatedir]) - -#### Have to go $localstatedir->$prefix/var->/usr/local/var - -#### find the actual value for $prefix that we'll end up with -## (I know this is broken and should be done in the Makefile, but -## that's a major pain and almost nobody actually seems to care) -AX_RECURSIVE_EVAL(["$prefix"], [EXPANDED_PREFIX]) -AX_RECURSIVE_EVAL(["$localstatedir"], [EXPANDED_LOCALSTATEDIR]) -AX_RECURSIVE_EVAL(["$sysconfdir"], [EXPANDED_SYSCONFDIR]) -AX_RECURSIVE_EVAL(["$bindir"], [EXPANDED_BINDIR]) -AX_RECURSIVE_EVAL(["$libdir"], [EXPANDED_LIBDIR]) -AX_RECURSIVE_EVAL(["$libexecdir"], [EXPANDED_LIBEXECDIR]) -AX_RECURSIVE_EVAL(["$datadir"], [EXPANDED_DATADIR]) -AX_RECURSIVE_EVAL(["$runstatedir"], [EXPANDED_RUNSTATEDIR]) -AC_SUBST([EXPANDED_PREFIX]) -AC_SUBST([EXPANDED_LOCALSTATEDIR]) -AC_SUBST([EXPANDED_SYSCONFDIR]) -AC_SUBST([EXPANDED_BINDIR]) -AC_SUBST([EXPANDED_LIBDIR]) -AC_SUBST([EXPANDED_LIBEXECDIR]) -AC_SUBST([EXPANDED_DATADIR]) -AC_SUBST([EXPANDED_RUNSTATEDIR]) - -##### systemd unit files -AC_ARG_WITH([systemdsystemunitdir], -AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]), - [], - [ - PKG_CHECK_EXISTS([systemd], - [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)], - [with_systemdsystemunitdir=no]) - ]) -if test "x$with_systemdsystemunitdir" != xno; then - AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) -fi -AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$have_systemd" != "xno" -a -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ]) - -AC_ARG_WITH([systemduserunitdir], -AS_HELP_STRING([--with-systemduserunitdir=DIR], [Directory for systemd user service files]), - [], - [ - PKG_CHECK_EXISTS([systemd], - [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)], - [with_systemduserunitdir='${libdir}/systemd/user']) - ]) -AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) - -##### Set up location for system bus socket - -AS_IF([test -n "$with_system_socket"], - [DBUS_SYSTEM_SOCKET=$with_system_socket], - [DBUS_SYSTEM_SOCKET=${EXPANDED_RUNSTATEDIR}/dbus/system_bus_socket]) - -dnl The actual check script is shared between Autotools and CMake. -AS_IF([test "$dbus_win" != yes], - [${CONFIG_SHELL-/bin/sh} "${srcdir}/tools/check-runstatedir.sh" "$DBUS_SYSTEM_SOCKET"]) - -AC_SUBST(DBUS_SYSTEM_SOCKET) -AC_DEFINE_UNQUOTED(DBUS_SYSTEM_SOCKET,"$DBUS_SYSTEM_SOCKET",[The name of the socket the system bus listens on by default]) - -## System bus only listens on local domain sockets, and never -## on an abstract socket (so only root can create the socket). -## -## This won't work on Windows. It's not meant to - the system bus is -## meaningless on Windows anyway. -## -## This has to be suitable for hard-coding in client libraries as well as -## in the dbus-daemon's configuration, so it has to be valid to listen on -## and also to connect to. If this ever changes, it'll need to be split into -## two variables, one for the listening address and one for the connecting -## address. -DBUS_SYSTEM_BUS_DEFAULT_ADDRESS="unix:path=$DBUS_SYSTEM_SOCKET" -AC_SUBST(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS) -AC_DEFINE_UNQUOTED(DBUS_SYSTEM_BUS_DEFAULT_ADDRESS, "$DBUS_SYSTEM_BUS_DEFAULT_ADDRESS",[The default D-Bus address of the system bus]) - -#### Set up the pid file -if ! test -z "$with_system_pid_file"; then - DBUS_SYSTEM_PID_FILE=$with_system_pid_file -else - DBUS_SYSTEM_PID_FILE="${EXPANDED_RUNSTATEDIR}/dbus/pid" -fi - -AC_SUBST(DBUS_SYSTEM_PID_FILE) - -#### File to check for console ownership -if test x$have_console_owner_file = xyes; then - if ! test -z "$with_console_owner_file"; then - DBUS_CONSOLE_OWNER_FILE=$with_console_owner_file - else - DBUS_CONSOLE_OWNER_FILE=/dev/console - fi -else - DBUS_CONSOLE_OWNER_FILE= -fi - -AC_SUBST(DBUS_CONSOLE_OWNER_FILE) -AC_DEFINE_UNQUOTED(DBUS_CONSOLE_OWNER_FILE, "$DBUS_CONSOLE_OWNER_FILE", [File to check for console ownerhip]) - -#### User to start the system bus as -if test -z "$with_dbus_user" ; then - DBUS_USER=messagebus -else - DBUS_USER=$with_dbus_user -fi -AC_SUBST(DBUS_USER) -AC_DEFINE_UNQUOTED(DBUS_USER,"$DBUS_USER", [User for running the system BUS daemon]) - -#### User for regression tests -AS_IF([test -z "$with_test_user"], [with_test_user=nobody]) -DBUS_TEST_USER="$with_test_user" -AC_SUBST([DBUS_TEST_USER]) -AC_DEFINE_UNQUOTED([DBUS_TEST_USER], ["$DBUS_TEST_USER"], - [Unprivileged user used in some regression tests]) - -#### Prefix to install into -DBUS_PREFIX=$EXPANDED_PREFIX -AC_SUBST(DBUS_PREFIX) -AC_DEFINE_UNQUOTED(DBUS_PREFIX,"$DBUS_PREFIX", [Prefix for installing DBUS]) - -#### Direcotry to install data files into -DBUS_DATADIR=$EXPANDED_DATADIR -AC_SUBST(DBUS_DATADIR) -AC_DEFINE_UNQUOTED(DBUS_DATADIR,"$DBUS_DATADIR", [Directory for installing DBUS data files]) - -#### Directory to install dbus-daemon -if test -z "$with_dbus_daemondir" ; then - DBUS_DAEMONDIR=$EXPANDED_BINDIR - dbus_daemondir='${bindir}' -else - DBUS_DAEMONDIR=$with_dbus_daemondir - dbus_daemondir=$with_dbus_daemondir -fi -AC_SUBST(DBUS_DAEMONDIR) -AC_SUBST(dbus_daemondir) -AC_DEFINE_UNQUOTED(DBUS_DAEMONDIR,"$DBUS_DAEMONDIR", [Directory for installing the DBUS daemon]) - -#### Directory to install the other binaries -DBUS_BINDIR="$EXPANDED_BINDIR" -AC_SUBST(DBUS_BINDIR) -AC_DEFINE_UNQUOTED(DBUS_BINDIR,"$DBUS_BINDIR", [Directory for installing the binaries]) - -#### Directory to install the libexec binaries -DBUS_LIBEXECDIR="$EXPANDED_LIBEXECDIR" -AC_SUBST(DBUS_LIBEXECDIR) -AC_DEFINE_UNQUOTED(DBUS_LIBEXECDIR,"$DBUS_LIBEXECDIR", [Directory for installing the libexec binaries]) - -AC_ARG_ENABLE([relocation], - [AS_HELP_STRING([--enable-relocation[=yes/no/auto]], - [Make pkg-config metadata relocatable [default=auto]])], - [], [enable_relocation=auto]) - -can_relocate=yes - -AS_CASE(["${exec_prefix}"], - ['NONE'|'${prefix}'|"${prefix}"], - [:], - [*], - [ - can_relocate=no - # If the user said --enable-relocation but we can't do it, error out - AS_IF([test "x$enable_relocation" = xyes], - [AC_MSG_ERROR([Relocatable pkg-config metadata requires --exec-prefix='\${prefix}', not ${exec_prefix}])]) - ]) - -AS_CASE(["${libdir}"], - ['${prefix}/lib'|'${prefix}/lib64'|'${exec_prefix}/lib'|'${exec_prefix}/lib64'|"${prefix}/lib"|"${exec_prefix}/lib"|"${prefix}/lib64"|"${exec_prefix}/lib64"], - [:], - [*], - [ - can_relocate=no - # If the user said --enable-relocation but we can't do it, error out - AS_IF([test "x$enable_relocation" = xyes], - [AC_MSG_ERROR([Relocatable pkg-config metadata requires default libdir, not ${libdir}])]) - ]) - -# By default, on Windows we are relocatable if possible -AS_IF([test "x$enable_relocation" = xauto && test "x$dbus_win" = xyes], - [enable_relocation="$can_relocate"]) - -# By default, on non-Windows we are not relocatable because it can interfere -# with pkg-config's ability to filter out system include directories, -# resulting in linking an outdated system-wide library in preference to a -# newer version installed elsewhere -AS_IF([test "x$enable_relocation" = xauto], - [enable_relocation="no"]) - - -AS_IF([test "x$enable_relocation" = xyes], - [AC_SUBST([pkgconfig_prefix], ['${pcfiledir}/../..'])], - [AC_SUBST([pkgconfig_prefix], ['${original_prefix}'])]) - -#### Directory to source sysconfdir configuration from - -# On Windows this is relative to where we put the bus setup, in -# ${datadir}/dbus-1. For simplicity, we only do this if -# ${sysconfdir} = ${prefix}/etc and ${datadir} = ${prefix}/share. -# -# On Unix, or on Windows with weird install layouts, it's the absolute path. -AS_IF([test "${dbus_win}" = yes && \ - test "$EXPANDED_SYSCONFDIR" = "$EXPANDED_PREFIX/etc" && \ - test "$EXPANDED_DATADIR" = "$EXPANDED_PREFIX/share"], - [SYSCONFDIR_FROM_PKGDATADIR="../../etc" - DATADIR_FROM_PKGSYSCONFDIR="../../share"], - [SYSCONFDIR_FROM_PKGDATADIR="$EXPANDED_SYSCONFDIR" - DATADIR_FROM_PKGSYSCONFDIR="$EXPANDED_DATADIR"]) -AC_SUBST([SYSCONFDIR_FROM_PKGDATADIR]) -AC_SUBST([DATADIR_FROM_PKGSYSCONFDIR]) - -#### Tell tests where to find certain stuff in builddir - -DBUS_PWD=`pwd` -# Useful in a cross-compilation environment, where the tests are run on the host system. -AC_ARG_WITH(dbus-test-dir, AS_HELP_STRING([--with-dbus-test-dir=[dirname]],[path where the tests tools are available]), - DBUS_PWD=$withval) - -DBUS_TEST_EXEC="$DBUS_PWD/test" -DBUS_TEST_DATA="$DBUS_PWD/test/data" - -AC_SUBST([DBUS_TEST_DATA]) -AC_SUBST([DBUS_TEST_EXEC]) - -AC_DEFINE_UNQUOTED([DBUS_EXEEXT], ["$EXEEXT"], - [Extension for executables, typically empty or .exe]) - -## Export the non-setuid external helper -TEST_LAUNCH_HELPER_BINARY="$DBUS_TEST_EXEC/dbus-daemon-launch-helper-for-tests$EXEEXT" -AC_SUBST(TEST_LAUNCH_HELPER_BINARY) -AC_DEFINE_UNQUOTED(DBUS_TEST_LAUNCH_HELPER_BINARY, "$TEST_LAUNCH_HELPER_BINARY", - [Full path to the launch helper test program in the builddir]) - -#### Find socket directories -if ! test -z "$TMPDIR" ; then - DEFAULT_SOCKET_DIR=$TMPDIR -elif ! test -z "$TEMP" ; then - DEFAULT_SOCKET_DIR=$TEMP -elif ! test -z "$TMP" ; then - DEFAULT_SOCKET_DIR=$TMP -else - DEFAULT_SOCKET_DIR=/tmp -fi - -DEFAULT_SOCKET_DIR=`echo $DEFAULT_SOCKET_DIR | sed 's/+/%2B/g'` - -if ! test -z "$with_test_socket_dir" ; then - TEST_SOCKET_DIR="$with_test_socket_dir" -else - TEST_SOCKET_DIR=$DEFAULT_SOCKET_DIR -fi -AC_SUBST(TEST_SOCKET_DIR) -AC_DEFINE_UNQUOTED(DBUS_TEST_SOCKET_DIR, "$TEST_SOCKET_DIR", [Where to put test sockets]) - -if test "x$dbus_unix" = xyes; then - TEST_LISTEN="unix:tmpdir=$TEST_SOCKET_DIR" -else - TEST_LISTEN="tcp:host=localhost" -fi -AC_SUBST([TEST_LISTEN]) -AC_DEFINE_UNQUOTED([TEST_LISTEN], ["$TEST_LISTEN"], - [Listening address for regression tests]) - -if ! test -z "$with_session_socket_dir" ; then - DBUS_SESSION_SOCKET_DIR="$with_session_socket_dir" -else - DBUS_SESSION_SOCKET_DIR=$DEFAULT_SOCKET_DIR -fi -AC_DEFINE_UNQUOTED(DBUS_SESSION_SOCKET_DIR, "$DBUS_SESSION_SOCKET_DIR", [Where per-session bus puts its sockets]) -AC_SUBST(DBUS_SESSION_SOCKET_DIR) - -# This must be a listening address. It doesn't necessarily need to be an -# address you can connect to - it can be something vague like -# "nonce-tcp:". -# -# The default varies by platform. -AC_ARG_WITH([dbus_session_bus_listen_address], - AS_HELP_STRING([--with-dbus-session-bus-listen-address=[ADDRESS]], - [default address for a session bus to listen on (see configure.ac)]), - [with_dbus_session_bus_listen_address=$withval], - [with_dbus_session_bus_listen_address=]) - -if test "x$with_dbus_session_bus_listen_address" != "x"; then - # the user specified something, trust them - DBUS_SESSION_BUS_LISTEN_ADDRESS="$with_dbus_session_bus_listen_address" -elif test x$dbus_win = xyes; then - # On Windows, you can (and should) listen on autolaunch addresses, - # because autolaunching is different. - # See https://bugs.freedesktop.org/show_bug.cgi?id=38201 - DBUS_SESSION_BUS_LISTEN_ADDRESS="autolaunch:" -elif test x$have_launchd = xyes; then - # Mac OS X default is to use launchd - DBUS_SESSION_BUS_LISTEN_ADDRESS="launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET" -else - # The default on all other Unix platforms (notably Linux) - # is to create a randomly named socket in /tmp or similar - DBUS_SESSION_BUS_LISTEN_ADDRESS="unix:tmpdir=$DBUS_SESSION_SOCKET_DIR" -fi -AC_SUBST([DBUS_SESSION_BUS_LISTEN_ADDRESS]) - -# This must be an address you can connect to. It doesn't necessarily -# need to be an address you can listen on - it can be "autolaunch:", -# even on Unix. -# -# The default varies by platform. -AC_ARG_WITH([dbus_session_bus_connect_address], - AS_HELP_STRING([--with-dbus-session-bus-connect-address=[ADDRESS]], - [fallback address for a session bus client to connect to (see configure.ac)]), - [with_dbus_session_bus_connect_address=$withval], - [with_dbus_session_bus_connect_address=]) - -if test "x$with_dbus_session_bus_connect_address" != "x"; then - # the user specified something, trust them - DBUS_SESSION_BUS_CONNECT_ADDRESS="$with_dbus_session_bus_connect_address" -elif test x$dbus_win = xyes; then - # Windows autolaunching is a bit different; leaving it in its own - # branch of the conditional because the default might conceivably - # change (see #38201) - DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:" -else - # The default on all other Unix platforms (notably Linux) - # is to use auto-launching - this works a bit differently on Mac OS X - # but comes out basically the same in the end - DBUS_SESSION_BUS_CONNECT_ADDRESS="autolaunch:" -fi -AC_SUBST([DBUS_SESSION_BUS_CONNECT_ADDRESS]) -AC_DEFINE_UNQUOTED([DBUS_SESSION_BUS_CONNECT_ADDRESS], - ["$DBUS_SESSION_BUS_CONNECT_ADDRESS"], - [Fallback address for session bus clients]) - -# darwin needs this to initialize the environment -AC_CHECK_FUNC(_NSGetEnviron, [AC_DEFINE(HAVE_NSGETENVIRON, 1, [Define if your system needs _NSGetEnviron to set up the environment])]) -AH_VERBATIM(_DARWIN_ENVIRON, -[ -#if defined(HAVE_NSGETENVIRON) && defined(HAVE_CRT_EXTERNS_H) -# include <sys/time.h> -# include <crt_externs.h> -# define environ (*_NSGetEnviron()) -#endif -]) - -AH_VERBATIM([USE_MINGW_ANSI_STDIO], -[ -/* On Windows, we expect to be using msvcrt.dll-compatible printf - * (%I64u instead of %llu) unless otherwise specified */ -#ifndef __USE_MINGW_ANSI_STDIO -# define __USE_MINGW_ANSI_STDIO 0 -#endif -]) - -AC_ARG_ENABLE([stats], - [AS_HELP_STRING([--disable-stats], - [disable bus daemon usage statistics])], - [], [enable_stats=yes]) -if test "x$enable_stats" = xyes; then - AC_DEFINE([DBUS_ENABLE_STATS], [1], - [Define to enable bus daemon usage statistics]) -fi - -AC_ARG_ENABLE([user-session], - [AS_HELP_STRING([--enable-user-session], - [enable user-session semantics for session bus under systemd])], - [], [enable_user_session=no]) -AM_CONDITIONAL([DBUS_ENABLE_USER_SESSION], - [test "x$enable_user_session" = xyes]) - -AC_CONFIG_FILES([ -Doxyfile -dbus/Version -dbus/versioninfo.rc -dbus/dbus-arch-deps.h -bus/system.conf -bus/session.conf -bus/legacy-config/system.conf -bus/legacy-config/session.conf -bus/example-system-enable-stats.conf -bus/example-session-disable-stats.conf -bus/org.freedesktop.dbus-session.plist -bus/dbus.service -bus/dbus.socket -bus/systemd-user/dbus.service -bus/systemd-user/dbus.socket -bus/sysusers.d/dbus.conf -bus/tmpfiles.d/dbus.conf -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-update-activation-environment.1.xml -doc/dbus-uuidgen.1.xml -doc/index.html -dbus-1.pc -dbus-1-uninstalled.pc -cmake/DBus1Config.cmake:cmake/DBus1Config.pkgconfig.in -cmake/DBus1ConfigVersion.cmake -]) -AC_OUTPUT - -dnl ========================================================================== -echo " - D-Bus $VERSION - ============== - - prefix: ${EXPANDED_PREFIX} - exec_prefix: ${exec_prefix} - libdir: ${EXPANDED_LIBDIR} - libexecdir: ${EXPANDED_LIBEXECDIR} - bindir: ${EXPANDED_BINDIR} - sysconfdir: ${EXPANDED_SYSCONFDIR} - localstatedir: ${EXPANDED_LOCALSTATEDIR} - runstatedir: ${EXPANDED_RUNSTATEDIR} - datadir: ${EXPANDED_DATADIR} - source code location: ${srcdir} - compiler: ${CC} - cflags: ${CFLAGS} - cppflags: ${CPPFLAGS} - cxxflags: ${CXXFLAGS} - ldflags: ${LDFLAGS} - 64-bit int: ${DBUS_INT64_TYPE} - 32-bit int: ${DBUS_INT32_TYPE} - 16-bit int: ${DBUS_INT16_TYPE} - pointer size: ${DBUS_SIZEOF_VOID_P} - Doxygen: ${DOXYGEN:-not found} - xmlto: ${XMLTO:-not found} - ducktype: ${DUCKTYPE:-not found} - yelp-build: ${YELP_BUILD:-not found}" - -echo " - Rebuilding generated files: ${USE_MAINTAINER_MODE} - gcc coverage profiling: ${enable_code_coverage} - Building embedded tests: ${enable_embedded_tests} - Building modular tests: ${enable_modular_tests} - - with GLib: ${with_glib} - Installing tests: ${enable_installed_tests} - Building verbose mode: ${enable_verbose_mode} - Building assertions: ${enable_asserts} - 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} - Traditional activation: ${enable_traditional_activation} - Building X11 code: ${have_x11} - Building Doxygen docs: ${enable_doxygen_docs} - Building Qt help file: ${enable_qthelp_docs} - Building Ducktype docs: ${enable_ducktype_docs} - Building XML docs: ${enable_xml_docs} - Building launchd support: ${have_launchd} - System bus socket: ${DBUS_SYSTEM_SOCKET} - System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} - System bus PID file: ${DBUS_SYSTEM_PID_FILE} - Session bus listens on: ${DBUS_SESSION_BUS_LISTEN_ADDRESS} - Session clients connect to: ${DBUS_SESSION_BUS_CONNECT_ADDRESS} - Console owner file: ${have_console_owner_file} - Console owner file path: ${DBUS_CONSOLE_OWNER_FILE} - System bus user: ${DBUS_USER} - Session bus services dir: ${EXPANDED_DATADIR}/dbus-1/services - 'make check' socket dir: ${TEST_SOCKET_DIR} -" -if test x$have_launchd = xyes; then - echo " launchd agent dir: ${LAUNCHD_AGENT_DIR}" -fi -echo - -if test x$enable_embedded_tests = xyes; then - echo "NOTE: building with unit tests increases the size of the installed library and renders it insecure." -fi -if test x$enable_embedded_tests = xyes -a x$enable_asserts = xno; then - echo "NOTE: building with embedded tests but without assertions means tests may not properly report failures (this configuration is only useful when doing something like profiling the tests)" -fi -AS_IF([test x$enable_code_coverage = xyes],[ - AC_MSG_WARN([Building with coverage profiling is definitely for developers only.]) - ]) -if test x$enable_verbose_mode = xyes; then - echo "NOTE: building with verbose mode increases library size, may slightly increase security risk, and decreases performance." -fi -if test x$enable_asserts = xyes; then - echo "NOTE: building with assertions increases library size and decreases performance." -fi -if test x$enable_checks = xno; then - echo "NOTE: building without checks for arguments passed to public API makes it harder to debug apps using D-Bus, but will slightly decrease D-Bus library size and _very_ slightly improve performance." -fi diff --git a/dbus-1-uninstalled.pc.in b/dbus-1-uninstalled.pc.in deleted file mode 100644 index b66ad2f6..00000000 --- a/dbus-1-uninstalled.pc.in +++ /dev/null @@ -1,20 +0,0 @@ -abs_top_builddir=@abs_top_builddir@ -abs_top_srcdir=@abs_top_srcdir@ -prefix= -exec_prefix= -bindir=@bindir@ -system_bus_default_address=@DBUS_SYSTEM_BUS_DEFAULT_ADDRESS@ -datarootdir=@datarootdir@ -datadir=@datadir@ -sysconfdir=@sysconfdir@ -session_bus_services_dir=${datadir}/dbus-1/services -system_bus_services_dir=${datadir}/dbus-1/system-services -interfaces_dir=${datadir}/dbus-1/interfaces -daemondir=@dbus_daemondir@ - -Name: dbus -Description: Free desktop message bus (uninstalled copy) -Version: @VERSION@ -Libs: ${abs_top_builddir}/dbus/libdbus-1.la -Libs.private: @LIBDBUS_LIBS@ -Cflags: -I${abs_top_srcdir} @DBUS_STATIC_BUILD_CPPFLAGS@ diff --git a/dbus/Makefile.am b/dbus/Makefile.am deleted file mode 100644 index 0d38aca2..00000000 --- a/dbus/Makefile.am +++ /dev/null @@ -1,340 +0,0 @@ - -dbusdatadir=$(datadir)/dbus-1 - -AM_CPPFLAGS = \ - $(CODE_COVERAGE_CPPFLAGS) \ - -I$(top_builddir) \ - -I$(top_srcdir) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ - $(SYSTEMD_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - -DDBUS_COMPILATION \ - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ - -DDBUS_SYSTEM_CONFIG_FILE=\""$(dbusdatadir)/system.conf"\" \ - -DDBUS_SESSION_CONFIG_FILE=\""$(dbusdatadir)/session.conf"\" \ - -DDBUS_RUNSTATEDIR=\""$(runstatedir)"\" \ - $(NULL) - -AM_CFLAGS = \ - $(CODE_COVERAGE_CFLAGS) \ - $(SANITIZE_CFLAGS) \ - $(NULL) - -if HAVE_VISIBILITY -if !DBUS_WIN -AM_CFLAGS += $(CFLAG_VISIBILITY) -AM_CPPFLAGS += \ - -DDBUS_EXPORT='__attribute__((__visibility__("default")))' \ - -DDBUS_PRIVATE_EXPORT='__attribute__((__visibility__("default")))' \ - $(NULL) -endif -endif - -# if assertions are enabled, improve backtraces -AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ - -dbusincludedir=$(includedir)/dbus-1.0/dbus -dbusarchincludedir=$(libdir)/dbus-1.0/include/dbus - -lib_LTLIBRARIES=libdbus-1.la - -# Initialize to empty so that we can append later -nodist_libdbus_1_la_SOURCES = - -# -# Deal with W32 .def and version-info.rc stuff -# -if DBUS_WIN - -SUFFIXES = .rc - -.rc.lo: - $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(RC) $< -o $@ - -endif - - -# -# Platform-dependent sources: -# -if DBUS_WIN -DBUS_LIB_arch_sources = \ - dbus-server-win.c \ - dbus-server-win.h \ - $(NULL) - -nodist_libdbus_1_la_SOURCES += \ - versioninfo.rc \ - $(NULL) - -if DBUS_WINCE -wince_source = dbus-sysdeps-wince-glue.h dbus-sysdeps-wince-glue.c -else -wince_source = -endif - -DBUS_SHARED_arch_sources = \ - $(wince_source) \ - dbus-backtrace-win.c \ - dbus-file-win.c \ - dbus-init-win.h \ - dbus-pipe-win.c \ - dbus-sockets-win.h \ - dbus-sysdeps-win.c \ - dbus-sysdeps-win.h \ - dbus-sysdeps-thread-win.c \ - dbus-transport-win.c \ - dbus-transport-win.h - -DBUS_UTIL_arch_sources = \ - dbus-sysdeps-util-win.c - -if ENABLE_TRADITIONAL_ACTIVATION -DBUS_UTIL_arch_sources += dbus-spawn-win.c -endif - -else - -if DBUS_ENABLE_LAUNCHD -launchd_source = dbus-server-launchd.h dbus-server-launchd.c -else -launchd_source = -endif - -DBUS_LIB_arch_sources = \ - dbus-uuidgen.c \ - dbus-uuidgen.h \ - dbus-server-unix.c - -DBUS_SHARED_arch_sources = \ - $(launchd_source) \ - dbus-file-unix.c \ - dbus-pipe-unix.c \ - dbus-sysdeps-unix.c \ - dbus-sysdeps-unix.h \ - dbus-sysdeps-pthread.c \ - dbus-transport-unix.c \ - dbus-transport-unix.h \ - dbus-userdb.c \ - dbus-userdb.h \ - $(NULL) - -DBUS_UTIL_arch_sources = \ - dbus-sysdeps-util-unix.c \ - dbus-userdb-util.c \ - $(NULL) - -if ENABLE_TRADITIONAL_ACTIVATION -DBUS_UTIL_arch_sources += dbus-spawn-unix.c -endif -endif - -if DBUS_HAVE_LINUX_EPOLL -DBUS_UTIL_arch_sources += dbus-pollable-set-epoll.c -endif - -dbusinclude_HEADERS= \ - dbus.h \ - dbus-address.h \ - dbus-bus.h \ - dbus-connection.h \ - dbus-errors.h \ - dbus-macros.h \ - dbus-memory.h \ - dbus-message.h \ - dbus-misc.h \ - dbus-pending-call.h \ - dbus-protocol.h \ - dbus-server.h \ - dbus-shared.h \ - dbus-signature.h \ - dbus-syntax.h \ - dbus-threads.h \ - dbus-types.h - - -nodist_dbusarchinclude_HEADERS= \ - dbus-arch-deps.h - -### source code that goes in the installed client library -### and is specific to library functionality -DBUS_LIB_SOURCES= \ - dbus-address.c \ - dbus-auth.c \ - dbus-auth.h \ - dbus-bus.c \ - dbus-connection.c \ - dbus-connection-internal.h \ - dbus-credentials.c \ - dbus-credentials.h \ - dbus-errors.c \ - dbus-keyring.c \ - dbus-keyring.h \ - dbus-marshal-header.c \ - dbus-marshal-header.h \ - dbus-marshal-byteswap.c \ - dbus-marshal-byteswap.h \ - dbus-marshal-recursive.c \ - dbus-marshal-recursive.h \ - dbus-marshal-validate.c \ - dbus-marshal-validate.h \ - dbus-message.c \ - dbus-message-internal.h \ - dbus-message-private.h \ - dbus-misc.c \ - dbus-nonce.h \ - dbus-nonce.c \ - dbus-object-tree.c \ - dbus-object-tree.h \ - dbus-pending-call.c \ - dbus-pending-call-internal.h \ - dbus-resources.c \ - dbus-resources.h \ - dbus-server.c \ - dbus-server-debug-pipe.c \ - dbus-server-debug-pipe.h \ - dbus-server-protected.h \ - dbus-server-socket.c \ - dbus-server-socket.h \ - $(DBUS_LIB_arch_sources) \ - dbus-sha.c \ - dbus-sha.h \ - dbus-signature.c \ - dbus-syntax.c \ - dbus-timeout.c \ - dbus-timeout.h \ - dbus-threads-internal.h \ - dbus-threads.c \ - dbus-transport.c \ - dbus-transport.h \ - dbus-transport-protected.h \ - dbus-transport-socket.c \ - dbus-transport-socket.h \ - dbus-watch.c \ - dbus-watch.h - -### source code that goes in the installed client library -### AND is generic utility functionality used by the -### daemon or test programs (all symbols in here should -### be underscore-prefixed) -DBUS_SHARED_SOURCES= \ - dbus-dataslot.c \ - dbus-dataslot.h \ - dbus-file.c \ - dbus-file.h \ - dbus-hash.c \ - dbus-hash.h \ - dbus-internals.c \ - dbus-internals.h \ - dbus-list.c \ - dbus-list.h \ - dbus-macros-internal.h \ - dbus-marshal-basic.c \ - dbus-marshal-basic.h \ - dbus-memory.c \ - dbus-mempool.c \ - dbus-mempool.h \ - dbus-pipe.c \ - dbus-pipe.h \ - dbus-string.c \ - dbus-string.h \ - dbus-string-private.h \ - $(DBUS_SHARED_arch_sources) \ - dbus-sysdeps.c \ - dbus-sysdeps.h \ - dbus-valgrind-internal.h - -if DBUS_ENABLE_EMBEDDED_TESTS -DBUS_SHARED_SOURCES += \ - dbus-test-tap.c \ - dbus-test-tap.h \ - $(NULL) -# else they are included in the test library instead -endif - -### source code that is generic utility functionality used -### by the bus daemon or test apps, but is NOT included -### in the D-Bus client library (all symbols in here -### should be underscore-prefixed but don't really need -### to be unless they move to DBUS_SHARED_SOURCES later) -DBUS_UTIL_SOURCES= \ - dbus-asv-util.c \ - dbus-asv-util.h \ - dbus-mainloop.c \ - dbus-mainloop.h \ - dbus-message-util.c \ - dbus-shell.c \ - dbus-shell.h \ - $(DBUS_UTIL_arch_sources) \ - dbus-pollable-set.h \ - dbus-pollable-set.c \ - dbus-pollable-set-poll.c \ - dbus-spawn.h \ - dbus-string-util.c \ - dbus-sysdeps-util.c \ - dbus-test.h - -libdbus_1_la_SOURCES= \ - $(DBUS_LIB_SOURCES) \ - $(DBUS_SHARED_SOURCES) - -libdbus_internal_la_SOURCES= \ - $(DBUS_UTIL_SOURCES) - -BUILT_SOURCES=$(nodist_dbusarchinclude_HEADERS) -EXTRA_DIST=dbus-arch-deps.h.in - -noinst_LTLIBRARIES=libdbus-internal.la - -libdbus_1_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -Ddbus_1_EXPORTS \ - $(NULL) - -if HAVE_LD_VERSION_SCRIPT -SYMBOL_EXPORT_LDFLAGS=-Wl,--version-script=Version -else -SYMBOL_EXPORT_LDFLAGS= -endif - -libdbus_1_la_LIBADD = \ - $(CODE_COVERAGE_LIBS) \ - $(LIBDBUS_LIBS) \ - $(NULL) -libdbus_1_la_LDFLAGS = \ - $(AM_LDFLAGS) \ - -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ - $(SYMBOL_EXPORT_LDFLAGS) \ - -no-undefined \ - $(NULL) - -libdbus_internal_la_LIBADD = \ - $(CODE_COVERAGE_LIBS) \ - $(LIBDBUS_LIBS) \ - libdbus-1.la \ - $(NULL) - -if DBUS_WIN -AM_CXXFLAGS = \ - $(CODE_COVERAGE_CXXFLAGS) \ - $(NULL) - -# This must be a separate convenience library, otherwise libtool notices -# that libdbus-1 might contain C++, links it with g++ and links in libstdc++, -# even on Unix where in fact it doesn't contain any C++. For Windows, where -# this code is used, we don't actually need libstdc++. -noinst_LTLIBRARIES += libdbus-init-win.la -libdbus_init_win_la_SOURCES = dbus-init-win.cpp -libdbus_1_la_LIBADD += libdbus-init-win.la -endif - -noinst_PROGRAMS = - -EXTRA_DIST += meson.build -EXTRA_DIST += test-version-script - -# Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE -include $(top_srcdir)/aminclude_static.am - -clean-local: - $(AM_V_at)rm -fr ./.dbus-keyrings diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 315c9349..00000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,230 +0,0 @@ -apidir = @htmldir@/api - -man_pages = \ - dbus-cleanup-sockets.1 \ - dbus-daemon.1 \ - dbus-launch.1 \ - dbus-monitor.1 \ - dbus-run-session.1 \ - dbus-send.1 \ - dbus-test-tool.1 \ - dbus-update-activation-environment.1 \ - dbus-uuidgen.1 \ - $(NULL) - -MAN_XML_FILES = $(patsubst %.1,%.1.xml,$(man_pages)) - -if DBUS_XML_DOCS_ENABLED -man1_MANS = $(man_pages) -endif - -MAN_HTML_FILES = $(patsubst %.1,%.1.html,$(man_pages)) - -dtddir = $(datadir)/xml/dbus-1 -dist_dtd_DATA = \ - busconfig.dtd \ - introspect.dtd - -xmlcatalogdir = $(dtddir) - -catalog.xml: catalog.xml.in - $(SED) "s|@DBUS_DTD_DIR@|$(dtddir)|" $< >$@ - -xmlcatalog_DATA = \ - catalog.xml - -dist_doc_DATA = system-activation.txt - -# uploaded and distributed, but not installed -STATIC_DOCS = \ - dbus-faq.xml \ - dbus-specification.xml \ - dbus-test-plan.xml \ - dbus-tutorial.xml \ - dbus-api-design.duck \ - dcop-howto.txt \ - introspect.xsl - -EXTRA_DIST = \ - catalog.xml.in \ - file-boilerplate.c \ - doxygen_to_devhelp.xsl \ - $(STATIC_DOCS) - -html_DATA = - -dist_html_DATA = - -# diagram.png/diagram.svg aren't really HTML, but must go in the same -# directory as the HTML to avoid broken links -STATIC_HTML = \ - diagram.png \ - diagram.svg \ - $(NULL) - -# Static HTML helper files generated by yelp-build. -YELP_STATIC_HTML = \ - yelp.js \ - C.css \ - highlight.pack.js \ - jquery.js \ - jquery.syntax.js \ - jquery.syntax.brush.html.js \ - jquery.syntax.core.js \ - jquery.syntax.layout.yelp.js \ - $(NULL) - -dist_html_DATA += $(STATIC_HTML) - -# Content HTML files generated by yelp-build. -YELP_HTML = \ - dbus-api-design.html \ - $(NULL) - -XMLTO_HTML = \ - dbus-faq.html \ - dbus-specification.html \ - dbus-test-plan.html \ - dbus-tutorial.html \ - $(MAN_HTML_FILES) \ - $(NULL) - -if DBUS_XML_DOCS_ENABLED -html_DATA += $(XMLTO_HTML) - -%.html: %.xml - $(XMLTO) --stringparam generate.consistent.ids=1 html-nochunks $< - -%.1: %.1.xml - $(XMLTO) man $< -endif - -if DBUS_DOXYGEN_DOCS_ENABLED -all-local:: doxygen.stamp - -doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch]) - $(AM_V_GEN)cd $(top_builddir) && doxygen Doxyfile - @touch $@ - -if DBUS_HAVE_XSLTPROC -html_DATA += dbus.devhelp2 - -dbus.devhelp2: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp - $(XSLTPROC) -o $@ $< api/xml/index.xml -endif - -if DBUS_DUCKTYPE_DOCS_ENABLED -html_DATA += $(YELP_HTML) - -%.page: %.duck - $(DUCKTYPE) -o $@ $< -%.html: %.page - $(YELP_BUILD) html $< -$(YELP_STATIC_HTML): $(YELP_HTML) -endif - -# this assumes CREATE_SUBDIRS isn't set to YES in Doxyfile -# (which it isn't currently) -install-data-local:: doxygen.stamp - $(MKDIR_P) $(DESTDIR)$(apidir) - $(INSTALL_DATA) api/html/* $(DESTDIR)$(apidir) -if DBUS_QTHELP_DOCS_ENABLED - $(MKDIR_P) $(DESTDIR)$(qchdir) - $(INSTALL_DATA) $(DOXYGEN_QCH_FILE) $(DESTDIR)$(qchdir) -endif -if DBUS_DUCKTYPE_DOCS_ENABLED - $(AM_V_at)for x in $(YELP_STATIC_HTML); do \ - if test -e "$$x"; then \ - $(INSTALL_DATA) "$$x" $(DESTDIR)$(htmldir); \ - fi; \ - done -endif - -uninstall-local:: - rm -f $(DESTDIR)$(apidir)/*.html - rm -f $(DESTDIR)$(apidir)/*.svg - rm -f $(DESTDIR)$(apidir)/*.png - rm -f $(DESTDIR)$(apidir)/*.css - rm -f $(DESTDIR)$(apidir)/*.js - rm -f $(DESTDIR)$(htmldir)/*.css - rm -f $(DESTDIR)$(htmldir)/*.js - rm -f $(DESTDIR)$(htmldir)/*.html - rm -f $(DESTDIR)$(docdir)/*.txt - rm -f $(DESTDIR)$(htmldir)/*.png - rm -f $(DESTDIR)$(htmldir)/*.svg - rm -f $(DESTDIR)$(apidir)/*.qhp - rm -f $(DESTDIR)$(qchdir)/dbus-*.qch - rmdir --ignore-fail-on-non-empty $(DESTDIR)$(apidir) || \ - rmdir $(DESTDIR)$(apidir) -endif - -if DBUS_CAN_UPLOAD_DOCS -BONUS_FILES = \ - $(top_srcdir)/README \ - $(top_srcdir)/CONTRIBUTING.md \ - $(top_srcdir)/AUTHORS \ - $(top_srcdir)/NEWS \ - $(top_srcdir)/COPYING \ - $(NULL) - -dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML) - $(AM_V_at)rm -rf $@ $@.tmp - $(AM_V_GEN)$(MKDIR_P) $@.tmp/api - $(AM_V_at)cd $(srcdir) && cp $(STATIC_DOCS) @abs_builddir@/$@.tmp - $(AM_V_at)cd $(srcdir) && cp $(dist_dtd_DATA) @abs_builddir@/$@.tmp - $(AM_V_at)cd $(srcdir) && cp $(dist_doc_DATA) @abs_builddir@/$@.tmp - $(AM_V_at)cd $(srcdir) && cp $(STATIC_HTML) @abs_builddir@/$@.tmp - $(AM_V_at)cp $(XMLTO_HTML) @abs_builddir@/$@.tmp - $(AM_V_at)cp $(YELP_HTML) @abs_builddir@/$@.tmp - $(AM_V_at)for x in $(YELP_STATIC_HTML); do \ - if test -e "$$x"; then \ - cp "$$x" @abs_builddir@/$@.tmp; \ - fi; \ - done - $(AM_V_at)cp $(MAN_HTML_FILES) @abs_builddir@/$@.tmp - $(AM_V_at)cp $(MAN_XML_FILES) @abs_builddir@/$@.tmp - $(AM_V_at)cp $(BONUS_FILES) @abs_builddir@/$@.tmp - $(AM_V_at)cp -r api/html @abs_builddir@/$@.tmp/api - $(AM_V_at)mv $@.tmp $@ - -dbus-docs.tar.xz: dbus-docs - $(AM_V_GEN)tar --xz -c -f $@ $< - -DOC_SERVER = dbus.freedesktop.org -DOC_WWW_DIR = /srv/dbus.freedesktop.org/www - -SPECIFICATION_SERVER = specifications.freedesktop.org -SPECIFICATION_PATH = /srv/specifications.freedesktop.org/www/dbus/1.0 - -maintainer-upload-docs: dbus-docs.tar.xz dbus-docs - scp dbus-docs.tar.xz $(DOC_SERVER):$(DOC_WWW_DIR)/ - rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX \ - dbus-docs/ $(DOC_SERVER):$(DOC_WWW_DIR)/doc/ - cd $(srcdir) && scp -p $(dist_dtd_DATA) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH)/ -else -maintainer-upload-docs: - @echo "Can't upload documentation! Re-run configure with" - @echo " --enable-doxygen-docs --enable-xml-docs --enable-ducktype-docs" - @false -endif - -CLEANFILES = \ - $(man1_MANS) \ - $(MAN_XML_FILES) \ - $(xmlcatalog_DATA) \ - $(XMLTO_HTML) \ - $(YELP_HTML) \ - $(YELP_STATIC_HTML) \ - $(NULL) - -clean-local: - rm -f $(html_DATA) - rm -rf api - rm -rf dbus-docs dbus-docs.tmp - rm -f *.1.html - rm -f doxygen.stamp - -EXTRA_DIST += list-doc-source.py -EXTRA_DIST += maintainer-upload-docs.sh -EXTRA_DIST += meson.build -EXTRA_DIST += meson_post_install.py diff --git a/m4/ax_ac_append_to_file.m4 b/m4/ax_ac_append_to_file.m4 deleted file mode 100644 index 242b3d52..00000000 --- a/m4/ax_ac_append_to_file.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_ac_append_to_file.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_AC_APPEND_TO_FILE([FILE],[DATA]) -# -# DESCRIPTION -# -# Appends the specified data to the specified Autoconf is run. If you want -# to append to a file when configure is run use AX_APPEND_TO_FILE instead. -# -# LICENSE -# -# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 10 - -AC_DEFUN([AX_AC_APPEND_TO_FILE],[ -AC_REQUIRE([AX_FILE_ESCAPES]) -m4_esyscmd( -AX_FILE_ESCAPES -[ -printf "%s" "$2" >> "$1" -]) -]) diff --git a/m4/ax_ac_print_to_file.m4 b/m4/ax_ac_print_to_file.m4 deleted file mode 100644 index 642dfc15..00000000 --- a/m4/ax_ac_print_to_file.m4 +++ /dev/null @@ -1,32 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_ac_print_to_file.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_AC_PRINT_TO_FILE([FILE],[DATA]) -# -# DESCRIPTION -# -# Writes the specified data to the specified file when Autoconf is run. If -# you want to print to a file when configure is run use AX_PRINT_TO_FILE -# instead. -# -# LICENSE -# -# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 10 - -AC_DEFUN([AX_AC_PRINT_TO_FILE],[ -m4_esyscmd( -AC_REQUIRE([AX_FILE_ESCAPES]) -[ -printf "%s" "$2" > "$1" -]) -]) diff --git a/m4/ax_add_am_macro_static.m4 b/m4/ax_add_am_macro_static.m4 deleted file mode 100644 index 6442d24b..00000000 --- a/m4/ax_add_am_macro_static.m4 +++ /dev/null @@ -1,28 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_add_am_macro_static.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_ADD_AM_MACRO_STATIC([RULE]) -# -# DESCRIPTION -# -# Adds the specified rule to $AMINCLUDE. -# -# LICENSE -# -# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net> -# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 8 - -AC_DEFUN([AX_ADD_AM_MACRO_STATIC],[ - AC_REQUIRE([AX_AM_MACROS_STATIC]) - AX_AC_APPEND_TO_FILE(AMINCLUDE_STATIC,[$1]) -]) diff --git a/m4/ax_am_macros_static.m4 b/m4/ax_am_macros_static.m4 deleted file mode 100644 index f4cee8c8..00000000 --- a/m4/ax_am_macros_static.m4 +++ /dev/null @@ -1,38 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_am_macros_static.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_AM_MACROS_STATIC -# -# DESCRIPTION -# -# Adds support for macros that create Automake rules. You must manually -# add the following line -# -# include $(top_srcdir)/aminclude_static.am -# -# to your Makefile.am files. -# -# LICENSE -# -# Copyright (c) 2009 Tom Howard <tomhoward@users.sf.net> -# Copyright (c) 2009 Allan Caffee <allan.caffee@gmail.com> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 11 - -AC_DEFUN([AMINCLUDE_STATIC],[aminclude_static.am]) - -AC_DEFUN([AX_AM_MACROS_STATIC], -[ -AX_AC_PRINT_TO_FILE(AMINCLUDE_STATIC,[ -# ]AMINCLUDE_STATIC[ generated automatically by Autoconf -# from AX_AM_MACROS_STATIC on ]m4_esyscmd([LC_ALL=C date])[ -]) -]) diff --git a/m4/ax_code_coverage.m4 b/m4/ax_code_coverage.m4 deleted file mode 100644 index 3d36924b..00000000 --- a/m4/ax_code_coverage.m4 +++ /dev/null @@ -1,272 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_code_coverage.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_CODE_COVERAGE() -# -# DESCRIPTION -# -# Defines CODE_COVERAGE_CPPFLAGS, CODE_COVERAGE_CFLAGS, -# CODE_COVERAGE_CXXFLAGS and CODE_COVERAGE_LIBS which should be included -# in the CPPFLAGS, CFLAGS CXXFLAGS and LIBS/LIBADD variables of every -# build target (program or library) which should be built with code -# coverage support. Also add rules using AX_ADD_AM_MACRO_STATIC; and -# $enable_code_coverage which can be used in subsequent configure output. -# CODE_COVERAGE_ENABLED is defined and substituted, and corresponds to the -# value of the --enable-code-coverage option, which defaults to being -# disabled. -# -# Test also for gcov program and create GCOV variable that could be -# substituted. -# -# Note that all optimization flags in CFLAGS must be disabled when code -# coverage is enabled. -# -# Usage example: -# -# configure.ac: -# -# AX_CODE_COVERAGE -# -# Makefile.am: -# -# include $(top_srcdir)/aminclude_static.am -# -# my_program_LIBS = ... $(CODE_COVERAGE_LIBS) ... -# my_program_CPPFLAGS = ... $(CODE_COVERAGE_CPPFLAGS) ... -# my_program_CFLAGS = ... $(CODE_COVERAGE_CFLAGS) ... -# my_program_CXXFLAGS = ... $(CODE_COVERAGE_CXXFLAGS) ... -# -# clean-local: code-coverage-clean -# distclean-local: code-coverage-dist-clean -# -# This results in a "check-code-coverage" rule being added to any -# Makefile.am which do "include $(top_srcdir)/aminclude_static.am" -# (assuming the module has been configured with --enable-code-coverage). -# Running `make check-code-coverage` in that directory will run the -# module's test suite (`make check`) and build a code coverage report -# detailing the code which was touched, then print the URI for the report. -# -# This code was derived from Makefile.decl in GLib, originally licensed -# under LGPLv2.1+. -# -# LICENSE -# -# Copyright (c) 2012, 2016 Philip Withnall -# Copyright (c) 2012 Xan Lopez -# Copyright (c) 2012 Christian Persch -# Copyright (c) 2012 Paolo Borelli -# Copyright (c) 2012 Dan Winship -# Copyright (c) 2015,2018 Bastien ROUCARIES -# -# This library is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or (at -# your option) any later version. -# -# This library is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser -# General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. - -#serial 32 - -m4_define(_AX_CODE_COVERAGE_RULES,[ -AX_ADD_AM_MACRO_STATIC([ -# Code coverage -# -# Optional: -# - CODE_COVERAGE_DIRECTORY: Top-level directory for code coverage reporting. -# Multiple directories may be specified, separated by whitespace. -# (Default: \$(top_builddir)) -# - CODE_COVERAGE_OUTPUT_FILE: Filename and path for the .info file generated -# by lcov for code coverage. (Default: -# \$(PACKAGE_NAME)-\$(PACKAGE_VERSION)-coverage.info) -# - CODE_COVERAGE_OUTPUT_DIRECTORY: Directory for generated code coverage -# reports to be created. (Default: -# \$(PACKAGE_NAME)-\$(PACKAGE_VERSION)-coverage) -# - CODE_COVERAGE_BRANCH_COVERAGE: Set to 1 to enforce branch coverage, -# set to 0 to disable it and leave empty to stay with the default. -# (Default: empty) -# - CODE_COVERAGE_LCOV_SHOPTS_DEFAULT: Extra options shared between both lcov -# instances. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) -# - CODE_COVERAGE_LCOV_SHOPTS: Extra options to shared between both lcov -# instances. (Default: $CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) -# - CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH: --gcov-tool pathtogcov -# - CODE_COVERAGE_LCOV_OPTIONS_DEFAULT: Extra options to pass to the -# collecting lcov instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) -# - CODE_COVERAGE_LCOV_OPTIONS: Extra options to pass to the collecting lcov -# instance. (Default: $CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) -# - CODE_COVERAGE_LCOV_RMOPTS_DEFAULT: Extra options to pass to the filtering -# lcov instance. (Default: empty) -# - CODE_COVERAGE_LCOV_RMOPTS: Extra options to pass to the filtering lcov -# instance. (Default: $CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) -# - CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT: Extra options to pass to the -# genhtml instance. (Default: based on $CODE_COVERAGE_BRANCH_COVERAGE) -# - CODE_COVERAGE_GENHTML_OPTIONS: Extra options to pass to the genhtml -# instance. (Default: $CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) -# - CODE_COVERAGE_IGNORE_PATTERN: Extra glob pattern of files to ignore -# -# The generated report will be titled using the \$(PACKAGE_NAME) and -# \$(PACKAGE_VERSION). In order to add the current git hash to the title, -# use the git-version-gen script, available online. -# Optional variables -# run only on top dir -if CODE_COVERAGE_ENABLED - ifeq (\$(abs_builddir), \$(abs_top_builddir)) -CODE_COVERAGE_DIRECTORY ?= \$(top_builddir) -CODE_COVERAGE_OUTPUT_FILE ?= \$(PACKAGE_NAME)-\$(PACKAGE_VERSION)-coverage.info -CODE_COVERAGE_OUTPUT_DIRECTORY ?= \$(PACKAGE_NAME)-\$(PACKAGE_VERSION)-coverage - -CODE_COVERAGE_BRANCH_COVERAGE ?= -CODE_COVERAGE_LCOV_SHOPTS_DEFAULT ?= \$(if \$(CODE_COVERAGE_BRANCH_COVERAGE),\ ---rc lcov_branch_coverage=\$(CODE_COVERAGE_BRANCH_COVERAGE)) -CODE_COVERAGE_LCOV_SHOPTS ?= \$(CODE_COVERAGE_LCOV_SHOPTS_DEFAULT) -CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH ?= --gcov-tool \"\$(GCOV)\" -CODE_COVERAGE_LCOV_OPTIONS_DEFAULT ?= \$(CODE_COVERAGE_LCOV_OPTIONS_GCOVPATH) -CODE_COVERAGE_LCOV_OPTIONS ?= \$(CODE_COVERAGE_LCOV_OPTIONS_DEFAULT) -CODE_COVERAGE_LCOV_RMOPTS_DEFAULT ?= -CODE_COVERAGE_LCOV_RMOPTS ?= \$(CODE_COVERAGE_LCOV_RMOPTS_DEFAULT) -CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT ?=\ -\$(if \$(CODE_COVERAGE_BRANCH_COVERAGE),\ ---rc genhtml_branch_coverage=\$(CODE_COVERAGE_BRANCH_COVERAGE)) -CODE_COVERAGE_GENHTML_OPTIONS ?= \$(CODE_COVERAGE_GENHTML_OPTIONS_DEFAULT) -CODE_COVERAGE_IGNORE_PATTERN ?= - -GITIGNOREFILES = \$(GITIGNOREFILES) \$(CODE_COVERAGE_OUTPUT_FILE) \$(CODE_COVERAGE_OUTPUT_DIRECTORY) -code_coverage_v_lcov_cap = \$(code_coverage_v_lcov_cap_\$(V)) -code_coverage_v_lcov_cap_ = \$(code_coverage_v_lcov_cap_\$(AM_DEFAULT_VERBOSITY)) -code_coverage_v_lcov_cap_0 = @echo \" LCOV --capture\" \$(CODE_COVERAGE_OUTPUT_FILE); -code_coverage_v_lcov_ign = \$(code_coverage_v_lcov_ign_\$(V)) -code_coverage_v_lcov_ign_ = \$(code_coverage_v_lcov_ign_\$(AM_DEFAULT_VERBOSITY)) -code_coverage_v_lcov_ign_0 = @echo \" LCOV --remove /tmp/*\" \$(CODE_COVERAGE_IGNORE_PATTERN); -code_coverage_v_genhtml = \$(code_coverage_v_genhtml_\$(V)) -code_coverage_v_genhtml_ = \$(code_coverage_v_genhtml_\$(AM_DEFAULT_VERBOSITY)) -code_coverage_v_genhtml_0 = @echo \" GEN \" \"\$(CODE_COVERAGE_OUTPUT_DIRECTORY)\"; -code_coverage_quiet = \$(code_coverage_quiet_\$(V)) -code_coverage_quiet_ = \$(code_coverage_quiet_\$(AM_DEFAULT_VERBOSITY)) -code_coverage_quiet_0 = --quiet - -# sanitizes the test-name: replaces with underscores: dashes and dots -code_coverage_sanitize = \$(subst -,_,\$(subst .,_,\$(1))) - -# Use recursive makes in order to ignore errors during check -check-code-coverage: - -\$(AM_V_at)\$(MAKE) \$(AM_MAKEFLAGS) -k check - \$(AM_V_at)\$(MAKE) \$(AM_MAKEFLAGS) code-coverage-capture - -# Capture code coverage data -code-coverage-capture: code-coverage-capture-hook - \$(code_coverage_v_lcov_cap)\$(LCOV) \$(code_coverage_quiet) \$(addprefix --directory ,\$(CODE_COVERAGE_DIRECTORY)) --capture --output-file \"\$(CODE_COVERAGE_OUTPUT_FILE).tmp\" --test-name \"\$(call code_coverage_sanitize,\$(PACKAGE_NAME)-\$(PACKAGE_VERSION))\" --no-checksum --compat-libtool \$(CODE_COVERAGE_LCOV_SHOPTS) \$(CODE_COVERAGE_LCOV_OPTIONS) - \$(code_coverage_v_lcov_ign)\$(LCOV) \$(code_coverage_quiet) \$(addprefix --directory ,\$(CODE_COVERAGE_DIRECTORY)) --remove \"\$(CODE_COVERAGE_OUTPUT_FILE).tmp\" \"/tmp/*\" \$(CODE_COVERAGE_IGNORE_PATTERN) --output-file \"\$(CODE_COVERAGE_OUTPUT_FILE)\" \$(CODE_COVERAGE_LCOV_SHOPTS) \$(CODE_COVERAGE_LCOV_RMOPTS) - -@rm -f \"\$(CODE_COVERAGE_OUTPUT_FILE).tmp\" - \$(code_coverage_v_genhtml)LANG=C \$(GENHTML) \$(code_coverage_quiet) \$(addprefix --prefix ,\$(CODE_COVERAGE_DIRECTORY)) --output-directory \"\$(CODE_COVERAGE_OUTPUT_DIRECTORY)\" --title \"\$(PACKAGE_NAME)-\$(PACKAGE_VERSION) Code Coverage\" --legend --show-details \"\$(CODE_COVERAGE_OUTPUT_FILE)\" \$(CODE_COVERAGE_GENHTML_OPTIONS) - @echo \"file://\$(abs_builddir)/\$(CODE_COVERAGE_OUTPUT_DIRECTORY)/index.html\" - -code-coverage-clean: - -\$(LCOV) --directory \$(top_builddir) -z - -rm -rf \"\$(CODE_COVERAGE_OUTPUT_FILE)\" \"\$(CODE_COVERAGE_OUTPUT_FILE).tmp\" \"\$(CODE_COVERAGE_OUTPUT_DIRECTORY)\" - -find . \\( -name \"*.gcda\" -o -name \"*.gcno\" -o -name \"*.gcov\" \\) -delete - -code-coverage-dist-clean: - -A][M_DISTCHECK_CONFIGURE_FLAGS = \$(A][M_DISTCHECK_CONFIGURE_FLAGS) --disable-code-coverage - else # ifneq (\$(abs_builddir), \$(abs_top_builddir)) -check-code-coverage: - -code-coverage-capture: code-coverage-capture-hook - -code-coverage-clean: - -code-coverage-dist-clean: - endif # ifeq (\$(abs_builddir), \$(abs_top_builddir)) -else #! CODE_COVERAGE_ENABLED -# Use recursive makes in order to ignore errors during check -check-code-coverage: - @echo \"Need to reconfigure with --enable-code-coverage\" -# Capture code coverage data -code-coverage-capture: code-coverage-capture-hook - @echo \"Need to reconfigure with --enable-code-coverage\" - -code-coverage-clean: - -code-coverage-dist-clean: - -endif #CODE_COVERAGE_ENABLED -# Hook rule executed before code-coverage-capture, overridable by the user -code-coverage-capture-hook: - -.PHONY: check-code-coverage code-coverage-capture code-coverage-dist-clean code-coverage-clean code-coverage-capture-hook -]) -]) - -AC_DEFUN([_AX_CODE_COVERAGE_ENABLED],[ - AX_CHECK_GNU_MAKE([],[AC_MSG_ERROR([not using GNU make that is needed for coverage])]) - AC_REQUIRE([AX_ADD_AM_MACRO_STATIC]) - # check for gcov - AC_CHECK_TOOL([GCOV], - [$_AX_CODE_COVERAGE_GCOV_PROG_WITH], - [:]) - AS_IF([test "X$GCOV" = "X:"], - [AC_MSG_ERROR([gcov is needed to do coverage])]) - AC_SUBST([GCOV]) - - dnl Check if gcc is being used - AS_IF([ test "$GCC" = "no" ], [ - AC_MSG_ERROR([not compiling with gcc, which is required for gcov code coverage]) - ]) - - AC_CHECK_PROG([LCOV], [lcov], [lcov]) - AC_CHECK_PROG([GENHTML], [genhtml], [genhtml]) - - AS_IF([ test x"$LCOV" = x ], [ - AC_MSG_ERROR([To enable code coverage reporting you must have lcov installed]) - ]) - - AS_IF([ test x"$GENHTML" = x ], [ - AC_MSG_ERROR([Could not find genhtml from the lcov package]) - ]) - - dnl Build the code coverage flags - dnl Define CODE_COVERAGE_LDFLAGS for backwards compatibility - CODE_COVERAGE_CPPFLAGS="-DNDEBUG" - CODE_COVERAGE_CFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" - CODE_COVERAGE_CXXFLAGS="-O0 -g -fprofile-arcs -ftest-coverage" - CODE_COVERAGE_LIBS="-lgcov" - - AC_SUBST([CODE_COVERAGE_CPPFLAGS]) - AC_SUBST([CODE_COVERAGE_CFLAGS]) - AC_SUBST([CODE_COVERAGE_CXXFLAGS]) - AC_SUBST([CODE_COVERAGE_LIBS]) -]) - -AC_DEFUN([AX_CODE_COVERAGE],[ - dnl Check for --enable-code-coverage - - # allow to override gcov location - AC_ARG_WITH([gcov], - [AS_HELP_STRING([--with-gcov[=GCOV]], [use given GCOV for coverage (GCOV=gcov).])], - [_AX_CODE_COVERAGE_GCOV_PROG_WITH=$with_gcov], - [_AX_CODE_COVERAGE_GCOV_PROG_WITH=gcov]) - - AC_MSG_CHECKING([whether to build with code coverage support]) - AC_ARG_ENABLE([code-coverage], - AS_HELP_STRING([--enable-code-coverage], - [Whether to enable code coverage support]),, - enable_code_coverage=no) - - AM_CONDITIONAL([CODE_COVERAGE_ENABLED], [test "x$enable_code_coverage" = xyes]) - AC_SUBST([CODE_COVERAGE_ENABLED], [$enable_code_coverage]) - AC_MSG_RESULT($enable_code_coverage) - - AS_IF([ test "x$enable_code_coverage" = xyes ], [ - _AX_CODE_COVERAGE_ENABLED - ]) - - _AX_CODE_COVERAGE_RULES -]) diff --git a/m4/ax_file_escapes.m4 b/m4/ax_file_escapes.m4 deleted file mode 100644 index a86fdc32..00000000 --- a/m4/ax_file_escapes.m4 +++ /dev/null @@ -1,30 +0,0 @@ -# =========================================================================== -# https://www.gnu.org/software/autoconf-archive/ax_file_escapes.html -# =========================================================================== -# -# SYNOPSIS -# -# AX_FILE_ESCAPES -# -# DESCRIPTION -# -# Writes the specified data to the specified file. -# -# LICENSE -# -# Copyright (c) 2008 Tom Howard <tomhoward@users.sf.net> -# -# Copying and distribution of this file, with or without modification, are -# permitted in any medium without royalty provided the copyright notice -# and this notice are preserved. This file is offered as-is, without any -# warranty. - -#serial 8 - -AC_DEFUN([AX_FILE_ESCAPES],[ -AX_DOLLAR="\$" -AX_SRB="\\135" -AX_SLB="\\133" -AX_BS="\\\\" -AX_DQ="\"" -]) diff --git a/m4/ld-version-script.m4 b/m4/ld-version-script.m4 deleted file mode 100644 index f6da0028..00000000 --- a/m4/ld-version-script.m4 +++ /dev/null @@ -1,44 +0,0 @@ -# ld-version-script.m4 serial 1 -dnl Copyright (C) 2008, 2009 Free Software Foundation, Inc. -dnl SPDX-License-Identifier: FSFULLR -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Simon Josefsson - -# FIXME: The test below returns a false positive for mingw -# cross-compiles, 'local:' statements does not reduce number of -# exported symbols in a DLL. Use --disable-ld-version-script to work -# around the problem. - -# gl_LD_VERSION_SCRIPT -# -------------------- -# Check if LD supports linker scripts, and define automake conditional -# HAVE_LD_VERSION_SCRIPT if so. -AC_DEFUN([gl_LD_VERSION_SCRIPT], -[ - AC_ARG_ENABLE([ld-version-script], - AS_HELP_STRING([--enable-ld-version-script], - [enable linker version script (default is enabled when possible)]), - [have_ld_version_script=$enableval], []) - if test -z "$have_ld_version_script"; then - AC_MSG_CHECKING([if LD -Wl,--version-script works]) - save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" - cat > conftest.map <<EOF -VERS_1 { - global: sym; -}; - -VERS_2 { - global: sym; -} VERS_1; -EOF - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])], - [have_ld_version_script=yes], [have_ld_version_script=no]) - rm -f conftest.map - LDFLAGS="$save_LDFLAGS" - AC_MSG_RESULT($have_ld_version_script) - fi -]) diff --git a/m4/visibility.m4 b/m4/visibility.m4 deleted file mode 100644 index 6539ef7f..00000000 --- a/m4/visibility.m4 +++ /dev/null @@ -1,78 +0,0 @@ -# visibility.m4 serial 5 (gettext-0.18.2) -dnl Copyright (C) 2005, 2008, 2010-2014 Free Software Foundation, Inc. -dnl SPDX-License-Identifier: FSFULLR -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl From Bruno Haible. - -dnl Tests whether the compiler supports the command-line option -dnl -fvisibility=hidden and the function and variable attributes -dnl __attribute__((__visibility__("hidden"))) and -dnl __attribute__((__visibility__("default"))). -dnl Does *not* test for __visibility__("protected") - which has tricky -dnl semantics (see the 'vismain' test in glibc) and does not exist e.g. on -dnl Mac OS X. -dnl Does *not* test for __visibility__("internal") - which has processor -dnl dependent semantics. -dnl Does *not* test for #pragma GCC visibility push(hidden) - which is -dnl "really only recommended for legacy code". -dnl Set the variable CFLAG_VISIBILITY. -dnl Defines and sets the variable HAVE_VISIBILITY. - -AC_DEFUN([gl_VISIBILITY], -[ - AC_REQUIRE([AC_PROG_CC]) - CFLAG_VISIBILITY= - HAVE_VISIBILITY=0 - if test -n "$GCC"; then - dnl First, check whether -Werror can be added to the command line, or - dnl whether it leads to an error because of some other option that the - dnl user has put into $CC $CFLAGS $CPPFLAGS. - AC_MSG_CHECKING([whether the -Werror option is usable]) - AC_CACHE_VAL([gl_cv_cc_vis_werror], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Werror" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[]], [[]])], - [gl_cv_cc_vis_werror=yes], - [gl_cv_cc_vis_werror=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_vis_werror]) - dnl Now check whether visibility declarations are supported. - AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL([gl_cv_cc_visibility], [ - gl_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -fvisibility=hidden" - dnl We use the option -Werror and a function dummyfunc, because on some - dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning - dnl "visibility attribute not supported in this configuration; ignored" - dnl at the first function definition in every compilation unit, and we - dnl don't want to use the option in this case. - if test $gl_cv_cc_vis_werror = yes; then - CFLAGS="$CFLAGS -Werror" - fi - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [[extern __attribute__((__visibility__("hidden"))) int hiddenvar; - extern __attribute__((__visibility__("default"))) int exportedvar; - extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void); - void dummyfunc (void) {} - ]], - [[]])], - [gl_cv_cc_visibility=yes], - [gl_cv_cc_visibility=no]) - CFLAGS="$gl_save_CFLAGS"]) - AC_MSG_RESULT([$gl_cv_cc_visibility]) - if test $gl_cv_cc_visibility = yes; then - CFLAG_VISIBILITY="-fvisibility=hidden" - HAVE_VISIBILITY=1 - fi - fi - AC_SUBST([CFLAG_VISIBILITY]) - AC_SUBST([HAVE_VISIBILITY]) - AC_DEFINE_UNQUOTED([HAVE_VISIBILITY], [$HAVE_VISIBILITY], - [Define to 1 or 0, depending whether the compiler supports simple visibility declarations.]) -]) diff --git a/test/Makefile.am b/test/Makefile.am deleted file mode 100644 index 3fdd9a8f..00000000 --- a/test/Makefile.am +++ /dev/null @@ -1,925 +0,0 @@ -## the "name-test" subdir in fact contains a bunch of tests now that need a temporary bus -## to be running to do stuff with. The directory should be renamed. -## We want to build the current directory first to pick up the testutils lib -SUBDIRS= . name-test -DIST_SUBDIRS=name-test - -CLEANFILES = -EXTRA_DIST = - -AM_CPPFLAGS = \ - $(CODE_COVERAGE_CPPFLAGS) \ - -I$(top_srcdir) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ - -DDBUS_COMPILATION \ - $(APPARMOR_CFLAGS) \ - $(GLIB_CFLAGS) \ - $(GIO_UNIX_CFLAGS) \ - $(VALGRIND_CFLAGS) \ - $(NULL) - -# improve backtraces from test stuff -AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ - -AM_CFLAGS = \ - $(CODE_COVERAGE_CFLAGS) \ - $(SANITIZE_CFLAGS) \ - $(NULL) - -noinst_LTLIBRARIES = libdbus-testutils.la - -libdbus_testutils_la_SOURCES = \ - disable-crash-handling.c \ - disable-crash-handling.h \ - test-utils.c \ - test-utils.h \ - $(NULL) - -if DBUS_WITH_GLIB -libdbus_testutils_la_SOURCES += \ - test-utils-glib.c \ - test-utils-glib.h \ - $(NULL) -endif - -libdbus_testutils_la_LIBADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(NULL) - -TEST_EXTENSIONS = .sh - -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh -LOG_COMPILER = $(srcdir)/glib-tap-test.sh -SH_LOG_DRIVER = $(LOG_DRIVER) -SH_LOG_COMPILER = $(SHELL) -EXTRA_DIST += glib-tap-test.sh -EXTRA_DIST += tap-test.sh.in - -TESTS = -noinst_PROGRAMS = - -if DBUS_ENABLE_EMBEDDED_TESTS - -uninstallable_test_programs = - -## break-loader removed for now -## these binaries are used in tests but are not themselves tests -TEST_BINARIES = \ - test-exit \ - test-names \ - test-privserver \ - test-segfault \ - test-shell-service \ - $(NULL) - -if !DBUS_WINCE -if ENABLE_TRADITIONAL_ACTIVATION -uninstallable_test_programs += test-spawn-oom -endif ENABLE_TRADITIONAL_ACTIVATION -endif !DBUS_WINCE - -if ENABLE_TRADITIONAL_ACTIVATION -TEST_BINARIES += test-spawn -endif - -uninstallable_test_programs += \ - test-platform-mutex \ - test-bus \ - test-bus-dispatch-sha1 \ - test-marshal-recursive \ - test-message-internals \ - test-strings \ - $(NULL) - -if ENABLE_TRADITIONAL_ACTIVATION -uninstallable_test_programs += test-normal-activation -endif - -if DBUS_UNIX -test_counter_SOURCES = internals/counter.c -test_counter_LDADD = libdbus-testutils.la - -if ENABLE_TRADITIONAL_ACTIVATION -uninstallable_test_programs += test-bus-launch-helper-oom -uninstallable_test_programs += test-bus-system -uninstallable_test_programs += test-failed-helper-activation -uninstallable_test_programs += test-helper-activation -# this is used by the tests but is not, itself, a test -TEST_BINARIES += dbus-daemon-launch-helper-for-tests -endif ENABLE_TRADITIONAL_ACTIVATION -endif DBUS_UNIX - -noinst_PROGRAMS += $(uninstallable_test_programs) -TESTS += $(uninstallable_test_programs) - -else !DBUS_ENABLE_EMBEDDED_TESTS - -TEST_BINARIES= - -endif !DBUS_ENABLE_EMBEDDED_TESTS - -test_atomic_SOURCES = internals/atomic.c -test_atomic_LDADD = libdbus-testutils.la - -noinst_PROGRAMS += $(TEST_BINARIES) - -# This helper is meant to crash, so if we're compiling the rest with -# AddressSanitizer, we need to stop it from catching the SIGSEGV and -# turning it into _exit(1); so don't give it SANITIZE_CFLAGS. -# CODE_COVERAGE_CFLAGS are fairly pointless here, too. -test_segfault_CFLAGS = - -test_service_LDADD = libdbus-testutils.la -test_names_LDADD = libdbus-testutils.la -test_privserver_LDADD = libdbus-testutils.la -## break_loader_LDADD = $(top_builddir)/dbus/libdbus-internal.la -test_shell_service_LDADD = libdbus-testutils.la -test_shell_SOURCES = shell-test.c -test_shell_LDADD = libdbus-testutils.la -test_strings_SOURCES = internals/strings.c -test_strings_LDADD = libdbus-testutils.la - -if ENABLE_TRADITIONAL_ACTIVATION -test_spawn_SOURCES = spawn-test.c -test_spawn_LDADD = $(top_builddir)/dbus/libdbus-internal.la -test_spawn_oom_SOURCES = internals/spawn-oom.c -test_spawn_oom_LDADD = libdbus-testutils.la -endif - -test_assertions_SOURCES = internals/assertions.c -test_assertions_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -test_printf_SOURCES = internals/printf.c -test_printf_LDADD = libdbus-testutils.la - -test_refs_SOURCES = internals/refs.c -test_refs_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -# We have to compile a separate copy of disable-crash-handling.c for -# test-segfault rather than using libdbus-testutils.la, because -# otherwise it would fail to link when using the AddressSanitizer. -test_segfault_SOURCES = \ - disable-crash-handling.c \ - disable-crash-handling.h \ - test-segfault.c \ - $(NULL) -# Deliberately not adding CODE_COVERAGE_LIBS here because we really -# don't care about coverage for the test program that segfaults! - -test_server_oom_SOURCES = internals/server-oom.c -test_server_oom_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -test_sysdeps_SOURCES = internals/sysdeps.c -test_sysdeps_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -test_syslog_SOURCES = internals/syslog.c -test_syslog_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -test_userdb_SOURCES = internals/userdb.c -test_userdb_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -test_variant_SOURCES = internals/variant.c -test_variant_LDADD = libdbus-testutils.la $(GLIB_LIBS) - -manual_backtrace_SOURCES = manual-backtrace.c -manual_backtrace_LDADD = $(top_builddir)/dbus/libdbus-1.la - -manual_dir_iter_SOURCES = manual-dir-iter.c -manual_dir_iter_LDADD = $(top_builddir)/dbus/libdbus-internal.la - -manual_paths_SOURCES = manual-paths.c -manual_paths_LDADD = libdbus-testutils.la - -manual_tcp_SOURCES = manual-tcp.c -manual_tcp_LDADD = $(top_builddir)/dbus/libdbus-internal.la - -test_bus_launch_helper_oom_SOURCES = bus/launch-helper-oom.c -test_bus_launch_helper_oom_LDADD = \ - $(top_builddir)/bus/liblaunch-helper-internal.la \ - libdbus-testutils.la \ - $(NULL) - -dbus_daemon_launch_helper_for_tests_SOURCES = bus/launch-helper-for-tests.c -dbus_daemon_launch_helper_for_tests_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/bus/liblaunch-helper-internal.la \ - $(NULL) - -test_bus_system_SOURCES = bus/system.c -test_bus_system_LDADD = \ - $(top_builddir)/bus/liblaunch-helper-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_bus_SOURCES = bus/main.c bus/common.c bus/common.h -test_bus_LDADD = \ - $(top_builddir)/bus/libdbus-daemon-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_bus_dispatch_sha1_SOURCES = bus/dispatch-sha1.c bus/common.c bus/common.h -test_bus_dispatch_sha1_LDADD = \ - $(top_builddir)/bus/libdbus-daemon-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_hash_SOURCES = internals/hash.c -test_hash_LDADD = libdbus-testutils.la - -test_failed_helper_activation_SOURCES = \ - bus/failed-helper-activation.c \ - bus/common.c \ - bus/common.h \ - $(NULL) -test_failed_helper_activation_LDADD = \ - $(top_builddir)/bus/libdbus-daemon-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_helper_activation_SOURCES = \ - bus/helper-activation.c \ - bus/common.c \ - bus/common.h \ - $(NULL) -test_helper_activation_LDADD = \ - $(top_builddir)/bus/libdbus-daemon-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_marshal_recursive_SOURCES = \ - internals/dbus-marshal-recursive-util.c \ - internals/dbus-marshal-recursive-util.h \ - internals/marshal-recursive.c \ - $(NULL) -test_marshal_recursive_LDADD = libdbus-testutils.la - -test_message_internals_SOURCES = \ - internals/dbus-marshal-recursive-util.c \ - internals/dbus-marshal-recursive-util.h \ - internals/dbus-message-factory.c \ - internals/dbus-message-factory.h \ - internals/dbus-message-util.c \ - internals/dbus-message-util.h \ - internals/message-internals.c \ - $(NULL) -test_message_internals_LDADD = libdbus-testutils.la - -test_misc_internals_SOURCES = \ - internals/address.c \ - internals/dbus-auth-script.c \ - internals/dbus-auth-script.h \ - internals/dbus-auth-util.c \ - internals/dbus-credentials-util.c \ - internals/dbus-marshal-byteswap-util.c \ - internals/dbus-marshal-recursive-util.c \ - internals/dbus-marshal-recursive-util.h \ - internals/dbus-marshal-validate-util.c \ - internals/dbus-string-util.c \ - internals/dbus-sysdeps-util.c \ - internals/mempool.c \ - internals/misc-internals.c \ - internals/misc-internals.h \ - internals/sha.c \ - $(NULL) -test_misc_internals_LDADD = libdbus-testutils.la - -test_normal_activation_SOURCES = \ - bus/normal-activation.c \ - bus/common.c \ - bus/common.h \ - $(NULL) -test_normal_activation_LDADD = \ - $(top_builddir)/bus/libdbus-daemon-internal.la \ - libdbus-testutils.la \ - $(NULL) - -test_platform_mutex_SOURCES = test-platform-mutex.c -test_platform_mutex_LDADD = \ - $(top_builddir)/dbus/libdbus-internal.la \ - libdbus-testutils.la \ - $(NULL) - -EXTRA_DIST += dbus-test-runner - -testexecdir = $(libexecdir)/installed-tests/dbus -testmetadir = $(datadir)/installed-tests/dbus - -nobase_dist_testexec_SCRIPTS = -nobase_testexec_PROGRAMS = -nobase_testmeta_DATA = - -installable_helpers = \ - test-service \ - test-sleep-forever \ - $(NULL) -installable_tests = \ - test-atomic \ - test-hash \ - test-shell \ - test-misc-internals \ - test-printf \ - $(NULL) -installable_manual_tests = \ - manual-backtrace \ - manual-dir-iter \ - manual-tcp \ - $(NULL) -dist_installable_test_scripts = \ - $(NULL) -dist_installed_test_scripts = \ - $(NULL) - -if DBUS_WIN -installable_manual_tests += manual-paths -endif - -if DBUS_WITH_GLIB -installable_tests += \ - test-assertions \ - test-corrupt \ - test-dbus-daemon \ - test-dbus-daemon-eavesdrop \ - test-desktop-file \ - test-fdpass \ - test-header-fields \ - test-message \ - test-monitor \ - test-loopback \ - test-marshal \ - test-refs \ - test-relay \ - test-server-oom \ - test-syntax \ - test-sysdeps \ - test-syslog \ - test-uid-permissions \ - test-userdb \ - test-variant \ - $(NULL) - -if DBUS_UNIX -# These binaries are used in tests but are not themselves tests -installable_helpers += \ - test-apparmor-activation \ - $(NULL) - -installable_tests += \ - test-containers \ - test-sd-activation \ - $(NULL) - -dist_installable_test_scripts += \ - test-dbus-daemon-fork.sh \ - $(NULL) - -# Only runnable when installed, not from the source tree -dist_installed_test_scripts += \ - integration/transient-services.sh \ - test-apparmor-activation.sh \ - $(NULL) - -# Testing dbus-launch relies on special code in that binary. -if DBUS_ENABLE_EMBEDDED_TESTS -dist_installable_test_scripts += \ - test-dbus-launch-eval.sh \ - $(NULL) - -if DBUS_ENABLE_X11_AUTOLAUNCH -dist_installable_test_scripts += \ - test-dbus-launch-x11.sh \ - $(NULL) -endif DBUS_ENABLE_X11_AUTOLAUNCH -endif DBUS_ENABLE_EMBEDDED_TESTS - -endif DBUS_UNIX - -installable_manual_tests += \ - manual-authz \ - manual-test-thread-blocking \ - $(NULL) -endif DBUS_WITH_GLIB - -if DBUS_UNIX -if DBUS_ENABLE_EMBEDDED_TESTS -installable_tests += \ - test-counter \ - $(NULL) -endif DBUS_ENABLE_EMBEDDED_TESTS -endif DBUS_UNIX - -installable_test_meta = \ - $(dist_installable_test_scripts:=.test) \ - $(dist_installed_test_scripts:=.test) \ - $(installable_tests:=.test) \ - $(NULL) -installable_test_meta_with_config = \ - $(dist_installable_test_scripts:=_with_config.test) \ - $(dist_installed_test_scripts:=_with_config.test) \ - $(installable_tests:=_with_config.test) \ - $(NULL) - -installcheck_tests = -installcheck_environment = \ - export XDG_DATA_HOME=@abs_top_builddir@/test/XDG_DATA_HOME; \ - export XDG_DATA_DIRS=@abs_top_builddir@/test/XDG_DATA_DIRS:$(DESTDIR)$(datadir); \ - export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ - export DBUS_SESSION_BUS_ADDRESS=do-not-use-real-session:; \ - export DBUS_TEST_DAEMON=$(DESTDIR)$(DBUS_DAEMONDIR)/dbus-daemon$(EXEEXT); \ - export DBUS_TEST_DBUS_LAUNCH=$(DESTDIR)$(bindir)/dbus-launch$(EXEEXT); \ - export DBUS_TEST_DBUS_MONITOR=$(DESTDIR)$(bindir)/dbus-monitor$(EXEEXT); \ - export DBUS_TEST_DBUS_SEND=$(DESTDIR)$(bindir)/dbus-send$(EXEEXT); \ - export DBUS_TEST_DBUS_UUIDGEN=$(DESTDIR)$(bindir)/dbus-uuidgen$(EXEEXT); \ - export DBUS_TEST_EXEC=@abs_top_builddir@/test; \ - export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \ - export DBUS_TEST_DATADIR=$(DESTDIR)$(datadir); \ - export DBUS_TEST_UNINSTALLED=1; \ - export HOME=@abs_top_builddir@/dbus; \ - ${NULL} - -# Tests in bus/config-parser.c rely on these specific values for XDG_* and -# DBUS_TEST_BUILDDIR. -AM_TESTS_ENVIRONMENT = \ - export XDG_DATA_HOME=@abs_top_builddir@/test/XDG_DATA_HOME; \ - export XDG_DATA_DIRS=@abs_top_builddir@/test/XDG_DATA_DIRS:@abs_top_builddir@/test/XDG_DATA_DIRS2; \ - export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ - export DBUS_FATAL_WARNINGS=1; \ - export DBUS_SESSION_BUS_ADDRESS=do-not-use-real-session:; \ - export DBUS_TEST_BUILDDIR=@abs_builddir@; \ - export DBUS_TEST_SRCDIR=@abs_srcdir@; \ - export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \ - export DBUS_TEST_DBUS_LAUNCH=@abs_top_builddir@/tools/dbus-launch$(EXEEXT); \ - export DBUS_TEST_DBUS_MONITOR=@abs_top_builddir@/tools/dbus-monitor$(EXEEXT); \ - export DBUS_TEST_DBUS_SEND=@abs_top_builddir@/tools/dbus-send$(EXEEXT); \ - export DBUS_TEST_DBUS_UUIDGEN=@abs_top_builddir@/tools/dbus-uuidgen$(EXEEXT); \ - export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \ - export DBUS_TEST_EXEC=@abs_top_builddir@/test; \ - export DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus; \ - export DBUS_TEST_UNINSTALLED=1; \ - export G_TEST_BUILDDIR=@abs_builddir@; \ - export G_TEST_SRCDIR=@abs_srcdir@; \ - export HOME=@abs_top_builddir@/dbus; \ - $(NULL) - -manual_authz_SOURCES = manual-authz.c -manual_authz_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -if DBUS_UNIX -test_apparmor_activation_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DDBUS_TEST_APPARMOR_ACTIVATION \ - $(NULL) -test_apparmor_activation_SOURCES = \ - sd-activation.c \ - $(NULL) -test_apparmor_activation_LDADD = \ - libdbus-testutils.la \ - $(APPARMOR_LIBS) \ - $(GLIB_LIBS) \ - $(NULL) -endif - -test_containers_SOURCES = containers.c -test_containers_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_corrupt_SOURCES = corrupt.c -test_corrupt_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_loopback_SOURCES = loopback.c -test_loopback_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_relay_SOURCES = relay.c -test_relay_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_dbus_daemon_SOURCES = dbus-daemon.c -test_dbus_daemon_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(GIO_UNIX_LIBS) \ - $(NULL) - -test_dbus_daemon_eavesdrop_SOURCES = dbus-daemon-eavesdrop.c -test_dbus_daemon_eavesdrop_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_desktop_file_SOURCES = \ - internals/desktop-file.c \ - $(NULL) -test_desktop_file_LDADD = \ - libdbus-testutils.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_header_fields_SOURCES = \ - header-fields.c \ - $(NULL) -test_header_fields_LDADD = \ - libdbus-testutils.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(GLIB_LIBS) \ - $(NULL) - -if DBUS_UNIX -test_sd_activation_SOURCES = \ - sd-activation.c \ - $(NULL) -test_sd_activation_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) -endif - -test_marshal_SOURCES = marshal.c -test_marshal_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_message_SOURCES = \ - message.c \ - $(NULL) -test_message_LDADD = \ - libdbus-testutils.la \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_monitor_SOURCES = \ - monitor.c \ - $(NULL) -test_monitor_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_syntax_SOURCES = syntax.c -test_syntax_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -manual_test_thread_blocking_SOURCES = thread-blocking.c -manual_test_thread_blocking_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_uid_permissions_SOURCES = \ - uid-permissions.c \ - $(NULL) -test_uid_permissions_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -test_fdpass_SOURCES = \ - fdpass.c \ - $(NULL) -test_fdpass_LDADD = \ - libdbus-testutils.la \ - $(GLIB_LIBS) \ - $(NULL) - -TESTS += $(dist_installable_test_scripts) -installcheck_tests += $(dist_installable_test_scripts) - -if DBUS_ENABLE_MODULAR_TESTS -TESTS += $(installable_tests) -installcheck_tests += $(installable_tests) - -if DBUS_ENABLE_INSTALLED_TESTS - nobase_testexec_PROGRAMS += $(installable_helpers) - nobase_testexec_PROGRAMS += $(installable_manual_tests) - nobase_testexec_PROGRAMS += $(installable_tests) - nobase_dist_testexec_SCRIPTS += $(dist_installed_test_scripts) - nobase_dist_testexec_SCRIPTS += $(dist_installable_test_scripts) - - nobase_testmeta_DATA += $(installable_test_meta) - nobase_testmeta_DATA += $(installable_test_meta_with_config) -else !DBUS_ENABLE_INSTALLED_TESTS - noinst_PROGRAMS += $(installable_helpers) - noinst_PROGRAMS += $(installable_manual_tests) - noinst_PROGRAMS += $(installable_tests) -endif !DBUS_ENABLE_INSTALLED_TESTS - -else !DBUS_ENABLE_MODULAR_TESTS - -if DBUS_ENABLE_EMBEDDED_TESTS - noinst_PROGRAMS += $(installable_helpers) -endif DBUS_ENABLE_EMBEDDED_TESTS - -endif !DBUS_ENABLE_MODULAR_TESTS - -# If we're installing the tests into a DESTDIR we can't run them -# again using the installed copy, because we don't know how to -# do a portable equivalent of setting LD_LIBRARY_PATH. -installcheck-local: - $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \ - AM_TESTS_ENVIRONMENT='$$(installcheck_environment)' -if DBUS_ENABLE_INSTALLED_TESTS - test -n "$(DESTDIR)" || { \ - $(installcheck_environment) \ - $(srcdir)/dbus-test-runner \ - $(testexecdir) \ - $(installable_tests); } -endif DBUS_ENABLE_INSTALLED_TESTS - -in_data = \ - data/dbus-installed-tests.aaprofile.in \ - data/systemd-activation/com.example.ReceiveDeniedByAppArmorLabel.service.in \ - data/systemd-activation/com.example.SendDeniedByAppArmorLabel.service.in \ - data/systemd-activation/com.example.SendDeniedByNonexistentAppArmorLabel.service.in \ - data/systemd-activation/com.example.SystemdActivatable3.service.in \ - data/valid-config-files-system/debug-allow-all-fail.conf.in \ - data/valid-config-files-system/debug-allow-all-pass.conf.in \ - data/valid-config-files/as-another-user.conf.in \ - data/valid-config-files/count-fds.conf.in \ - data/valid-config-files/debug-allow-all-sha1.conf.in \ - data/valid-config-files/debug-allow-all.conf.in \ - data/valid-config-files/finite-timeout.conf.in \ - data/valid-config-files/forbidding.conf.in \ - data/valid-config-files/incoming-limit.conf.in \ - data/valid-config-files/limit-containers.conf.in \ - data/valid-config-files/listen-autolaunch-win.conf.in \ - data/valid-config-files/max-completed-connections.conf.in \ - data/valid-config-files/max-connections-per-user.conf.in \ - data/valid-config-files/max-containers.conf.in \ - data/valid-config-files/max-match-rules-per-connection.conf.in \ - data/valid-config-files/max-names-per-connection.conf.in \ - data/valid-config-files/max-replies-per-connection.conf.in \ - data/valid-config-files/multi-user.conf.in \ - data/valid-config-files/pending-fd-timeout.conf.in \ - data/valid-config-files/send-destination-prefix-rules.conf.in \ - data/valid-config-files/systemd-activation.conf.in \ - data/valid-config-files/tmp-session.conf.in \ - data/valid-config-files-system/tmp-session-like-system.conf.in \ - data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoExec.service.in \ - data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoService.service.in \ - data/invalid-service-files-system/org.freedesktop.DBus.TestSuiteNoUser.service.in \ - data/valid-service-files-system/org.freedesktop.DBus.TestSuiteEchoService.service.in \ - data/valid-service-files-system/org.freedesktop.DBus.TestSuiteSegfaultService.service.in \ - data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in \ - data/valid-service-files-system/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuite.PrivServer.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuiteEchoService.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuiteForkingEchoService.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuiteSegfaultService.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceFail.service.in \ - data/valid-service-files/org.freedesktop.DBus.TestSuiteShellEchoServiceSuccess.service.in \ - $(NULL) - -EXTRA_DIST += $(in_data) - -static_data = \ - data/auth/anonymous-client-successful.auth-script \ - data/auth/anonymous-server-successful.auth-script \ - data/auth/cancel.auth-script \ - data/auth/client-out-of-mechanisms.auth-script \ - data/auth/cookie-sha1-username.auth-script \ - data/auth/cookie-sha1.auth-script \ - data/auth/external-auto.auth-script \ - data/auth/external-failed.auth-script \ - data/auth/external-root.auth-script \ - data/auth/external-silly.auth-script \ - data/auth/external-successful.auth-script \ - data/auth/external-username.auth-script \ - data/auth/extra-bytes.auth-script \ - data/auth/fail-after-n-attempts.auth-script \ - data/auth/fallback.auth-script \ - data/auth/invalid-command-client.auth-script \ - data/auth/invalid-command.auth-script \ - data/auth/invalid-hex-encoding.auth-script \ - data/auth/mechanisms.auth-script \ - data/equiv-config-files/basic/basic-1.conf \ - data/equiv-config-files/basic/basic-2.conf \ - data/equiv-config-files/basic/basic.d/basic.conf \ - data/equiv-config-files/entities/basic.d/basic.conf \ - data/equiv-config-files/entities/entities-1.conf \ - data/equiv-config-files/entities/entities-2.conf \ - data/invalid-config-files/apparmor-bad-attribute.conf \ - data/invalid-config-files/apparmor-bad-mode.conf \ - data/invalid-config-files/bad-attribute.conf \ - data/invalid-config-files/bad-attribute-2.conf \ - data/invalid-config-files/bad-element.conf \ - data/invalid-config-files/bad-limit.conf \ - data/invalid-config-files/badselinux-1.conf \ - data/invalid-config-files/badselinux-2.conf \ - data/invalid-config-files/circular-1.conf \ - data/invalid-config-files/circular-2.conf \ - data/invalid-config-files/circular-3.conf \ - data/invalid-config-files/double-attribute.conf \ - data/invalid-config-files/impossible-send.conf \ - data/invalid-config-files/limit-no-name.conf \ - data/invalid-config-files/ludicrous-limit.conf \ - data/invalid-config-files/negative-limit.conf \ - data/invalid-config-files/non-numeric-limit.conf \ - data/invalid-config-files/not-well-formed.conf \ - data/invalid-config-files/policy-bad-at-console.conf \ - data/invalid-config-files/policy-bad-attribute.conf \ - data/invalid-config-files/policy-bad-context.conf \ - data/invalid-config-files/policy-bad-rule-attribute.conf \ - data/invalid-config-files/policy-contradiction.conf \ - data/invalid-config-files/policy-member-no-path.conf \ - data/invalid-config-files/policy-mixed.conf \ - data/invalid-config-files/policy-no-attributes.conf \ - data/invalid-config-files/policy-no-rule-attribute.conf \ - data/invalid-config-files/truncated-file.conf \ - data/invalid-config-files/send-and-receive.conf \ - data/invalid-config-files/unknown-limit.conf \ - data/invalid-messages/boolean-has-no-value.message-raw \ - data/invalid-messages/fixed-array-not-divisible.message-raw \ - data/invalid-messages/fixed-array-not-divisible.message-raw.hex \ - data/invalid-messages/issue418.message-raw \ - data/invalid-messages/issue418.message-raw.hex \ - data/invalid-messages/mis-nested-sig.message-raw \ - data/invalid-messages/mis-nested-sig.message-raw.hex \ - data/invalid-messages/truncated-variant-sig.message-raw \ - data/invalid-messages/truncated-variant-sig.message-raw.hex \ - data/invalid-messages/zero-length-variant-sig.message-raw \ - data/invalid-messages/zero-length-variant-sig.message-raw.hex \ - data/sha-1/Readme.txt \ - data/sha-1/bit-hashes.sha1 \ - data/sha-1/bit-messages.sha1 \ - data/sha-1/byte-hashes.sha1 \ - data/sha-1/byte-messages.sha1 \ - data/systemd-activation/com.example.ReceiveDenied.service \ - data/systemd-activation/com.example.SendDenied.service \ - data/systemd-activation/com.example.SendDeniedByAppArmorName.service \ - data/systemd-activation/com.example.SendPrefixDenied.service \ - data/systemd-activation/com.example.SendPrefixDenied.internal.service \ - data/systemd-activation/com.example.SendPrefixDenied.SendPrefixAllowed.internal.service \ - data/systemd-activation/com.example.SystemdActivatable1.service \ - data/systemd-activation/com.example.SystemdActivatable2.service \ - data/systemd-activation/org.freedesktop.systemd1.service \ - data/valid-config-files/basic.conf \ - data/valid-config-files/basic.d/basic.conf \ - data/valid-config-files/check-own-rules.conf \ - data/valid-config-files/entities.conf \ - data/valid-config-files/listen-unix-runtime.conf \ - data/valid-config-files/many-rules.conf \ - data/valid-config-files/minimal.conf \ - data/valid-config-files/standard-session-dirs.conf \ - data/valid-config-files-system/many-rules.conf \ - data/valid-config-files-system/system.d/test.conf \ - data/valid-messages/byteswap-fd-index.message-raw \ - data/valid-messages/byteswap-fd-index.message-raw.hex \ - data/valid-messages/minimal.message-raw \ - data/valid-messages/minimal.message-raw.hex \ - $(NULL) - -EXTRA_DIST += $(static_data) - -## copy tests to builddir so that generated tests and static tests -## are all in one place. -## Note that we can't create the XDG_RUNTIME_DIR with permissions 0700 -## on MSYS2, which rejects attempts to change permissions, hence "|| true". -all-local: copy-config-local uninstalled-config-local - $(AM_V_at)$(MKDIR_P) XDG_RUNTIME_DIR - $(AM_V_at)chmod 0700 XDG_RUNTIME_DIR || true - -copy-config-local: - $(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d - $(AM_V_GEN)set -e; \ - if test $(srcdir) = . || test $(srcdir) -ef .; then \ - echo '-- No need to copy test data as srcdir = builddir'; \ - else \ - for F in $(static_data); do \ - $(MKDIR_P) "$${F%/*}"; \ - rm -f "$$F"; \ - cp $(srcdir)/"$$F" "$$F"; \ - done; \ - fi - -uninstalled-config-local: - $(AM_V_GEN)set -e; \ - for F in $(in_data); do \ - $(MKDIR_P) "$${F%/*}"; \ - sed \ - -e 's,[@]DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL[@],$(DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL),' \ - -e 's,[@]DBUS_SESSION_BUS_LISTEN_ADDRESS[@],$(DBUS_SESSION_BUS_LISTEN_ADDRESS),' \ - -e 's,[@]DBUS_TEST_DATA[@],@abs_builddir@/data,' \ - -e 's,[@]DBUS_TEST_EXEC[@],@abs_builddir@,' \ - -e 's,[@]DBUS_USER[@],$(DBUS_USER),' \ - -e 's,[@]EXEEXT[@],$(EXEEXT),' \ - -e 's,[@]TEST_LAUNCH_HELPER_BINARY[@],@abs_top_builddir@/test/dbus-daemon-launch-helper-for-tests$(EXEEXT),' \ - -e 's,[@]TEST_LISTEN[@],$(TEST_LISTEN),' \ - < $(srcdir)/"$$F" > "$${F%.in}"; \ - done - -installable-config-local: -if DBUS_ENABLE_INSTALLED_TESTS - $(AM_V_GEN)set -e; \ - for F in $(in_data); do \ - $(MKDIR_P) "installable/$${F%/*}"; \ - sed \ - -e 's,[@]DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL[@],$(DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL),' \ - -e 's,[@]DBUS_SESSION_BUS_LISTEN_ADDRESS[@],$(DBUS_SESSION_BUS_LISTEN_ADDRESS),' \ - -e 's,[@]DBUS_TEST_DATA[@],$(testexecdir)/data,' \ - -e 's,[@]DBUS_TEST_EXEC[@],$(testexecdir),' \ - -e 's,[@]DBUS_USER[@],$(DBUS_USER),' \ - -e 's,[@]EXEEXT[@],$(EXEEXT),' \ - -e 's,[@]TEST_LAUNCH_HELPER_BINARY[@],/bin/false,' \ - -e 's,[@]TEST_LISTEN[@],$(TEST_LISTEN),' \ - < $(srcdir)/"$$F" > "installable/$${F%.in}"; \ - done -else - @: -endif - - -install-data-local: install-config-local - @: - -install-config-local: installable-config-local -if DBUS_ENABLE_INSTALLED_TESTS - $(AM_V_GEN)set -e; \ - for F in $(static_data); do \ - install -d "$(DESTDIR)$(testexecdir)/$${F%/*}"; \ - install -m644 "$(srcdir)/$$F" "$(DESTDIR)$(testexecdir)/$$F"; \ - done; \ - for F in $(in_data); do \ - install -d "$(DESTDIR)$(testexecdir)/$${F%/*}"; \ - install -m644 "installable/$${F%.in}" "$(DESTDIR)$(testexecdir)/$${F%.in}"; \ - done - ln -nfs $(datadir)/dbus-1/session.conf $(DESTDIR)$(testexecdir)/data/valid-config-files/session.conf - ln -nfs $(datadir)/dbus-1/system.conf $(DESTDIR)$(testexecdir)/data/valid-config-files-system/system.conf -else - @: -endif - -## this doesn't clean most copied test data files when srcdir=builddir -clean-local: - $(AM_V_at)if test $(srcdir) = . || test $(srcdir) -ef .; then \ - echo '-- No need to clean test data as srcdir = builddir'; \ - else \ - rm -f $(static_data); \ - for F in $(in_data); do \ - rm -f "$${F%.in}"; \ - done; \ - fi - rm -fr ./XDG_RUNTIME_DIR ./installable - -imported_data = \ - data/valid-config-files/session.conf \ - data/valid-config-files-system/system.conf \ - $(NULL) - -noinst_DATA = $(imported_data) -CLEANFILES += \ - $(noinst_DATA) \ - $(NULL) - -data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf - $(AM_V_at)$(MKDIR_P) data/valid-config-files - $(AM_V_GEN)cp $< $@ - -data/valid-config-files-system/system.conf: $(top_builddir)/bus/system.conf - $(AM_V_at)$(MKDIR_P) data/valid-config-files-system - $(AM_V_GEN)cp $< $@ - -$(installable_test_meta): %.test: %$(EXEEXT) Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) ( \ - echo '[Test]'; \ - echo 'Type=session'; \ - echo 'Output=TAP'; \ - echo 'Exec=env $(testexecdir)/$* --tap'; \ - ) > $@.tmp && mv $@.tmp $@ - -$(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile - $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN) ( \ - echo '[Test]'; \ - echo 'Type=session'; \ - echo 'Output=TAP'; \ - echo 'Exec=env DBUS_TEST_EXEC=$(testexecdir) DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$* --tap'; \ - ) > $@.tmp && mv $@.tmp $@ - -EXTRA_DIST += data/copy_data_for_tests.py -EXTRA_DIST += data/installable/meson.build -EXTRA_DIST += data/meson.build -EXTRA_DIST += meson.build -EXTRA_DIST += meta_template.test.in -EXTRA_DIST += mkdir-m700.py - -# Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE -include $(top_srcdir)/aminclude_static.am diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am deleted file mode 100644 index e1cc82d2..00000000 --- a/test/name-test/Makefile.am +++ /dev/null @@ -1,125 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - $(CODE_COVERAGE_CPPFLAGS) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ - $(VALGRIND_CFLAGS) \ - -DDBUS_COMPILATION \ - $(NULL) - -AM_CFLAGS = \ - $(CODE_COVERAGE_CFLAGS) \ - $(SANITIZE_CFLAGS) \ - $(NULL) - -# if assertions are enabled, improve backtraces -AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ - -TEST_EXTENSIONS = .sh - -LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) $(top_srcdir)/build-aux/tap-driver.sh -SH_LOG_DRIVER = $(LOG_DRIVER) - -LOG_COMPILER = \ - @abs_top_builddir@/tools/dbus-run-session$(EXEEXT) \ - --config-file=@abs_top_builddir@/test/data/valid-config-files/tmp-session.conf \ - --dbus-daemon=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ - -- \ - $(NULL) -SH_LOG_COMPILER = $(SHELL) - -## note that TESTS has special meaning (stuff to use in make check) -## so if adding tests not to be run in make check, don't add them to -## TESTS -TESTS = - -if DBUS_ENABLE_EMBEDDED_TESTS -if DBUS_UNIX -AM_TESTS_ENVIRONMENT = \ - export DBUS_SESSION_BUS_ADDRESS=do-not-use-real-session:; \ - export DBUS_TOP_BUILDDIR=@abs_top_builddir@; \ - export DBUS_TOP_SRCDIR=@abs_top_srcdir@; \ - export PATH="@abs_top_builddir@/bus:$$PATH"; \ - export DBUS_TEST_DATA=@abs_top_builddir@/test/data; \ - export DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT); \ - export DBUS_TEST_DBUS_LAUNCH=@abs_top_builddir@/tools/dbus-launch$(EXEEXT); \ - export XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR; \ - unset DBUS_SESSION_BUS_ADDRESS; \ - unset DBUS_SESSION_BUS_PID; \ - $(NULL) - -TESTS += \ - run-test.sh \ - run-test-systemserver.sh \ - test-ids \ - test-pending-call-disconnected \ - test-shutdown \ - $(NULL) - -if ENABLE_TRADITIONAL_ACTIVATION -TESTS += \ - test-pending-call-dispatch \ - test-pending-call-timeout \ - test-privserver-client \ - test-threads-init \ - $(NULL) -endif -endif -endif - -EXTRA_DIST=run-test.sh run-test-systemserver.sh - -if DBUS_ENABLE_EMBEDDED_TESTS - -## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we -## build even when not doing "make check" -noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-pending-call-disconnected test-threads-init test-ids test-shutdown test-privserver-client - -test_pending_call_dispatch_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) -test_pending_call_timeout_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) -test_pending_call_disconnected_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) -test_threads_init_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) -test_ids_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) - -test_shutdown_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - ../libdbus-testutils.la \ - $(NULL) -test_privserver_client_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - ../libdbus-testutils.la \ - $(NULL) - -if DBUS_WIN -noinst_PROGRAMS += test-autolaunch-win -test_autolaunch_win_SOURCES = test-autolaunch-win.c -test_autolaunch_win_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - ../libdbus-testutils.la \ - $(NULL) -TESTS += test-autolaunch-win -else -noinst_PROGRAMS += test-autolaunch -test_autolaunch_SOURCES = test-autolaunch.c -test_autolaunch_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - ../libdbus-testutils.la \ - $(NULL) -endif -endif - -EXTRA_DIST += meson.build diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 5488b54d..00000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,158 +0,0 @@ -AM_CPPFLAGS = \ - -I$(top_srcdir) \ - $(CODE_COVERAGE_CPPFLAGS) \ - $(DBUS_STATIC_BUILD_CPPFLAGS) \ - $(DBUS_X_CFLAGS) \ - -DDBUS_COMPILATION \ - -DDBUS_MACHINE_UUID_FILE=\""$(localstatedir)/lib/dbus/machine-id"\" \ - $(NULL) - -AM_CFLAGS = \ - $(CODE_COVERAGE_CFLAGS) \ - $(SANITIZE_CFLAGS) \ - $(NULL) - -# if assertions are enabled, improve backtraces -AM_LDFLAGS = @R_DYNAMIC_LDFLAG@ - -bin_PROGRAMS = \ - dbus-launch \ - dbus-monitor \ - dbus-run-session \ - dbus-send \ - dbus-test-tool \ - dbus-update-activation-environment \ - $(NULL) - -if DBUS_UNIX -bin_PROGRAMS += \ - dbus-cleanup-sockets \ - dbus-uuidgen \ - $(NULL) -endif - -dbus_send_SOURCES= \ - dbus-print-message.c \ - dbus-print-message.h \ - dbus-send.c \ - tool-common.c \ - tool-common.h \ - $(NULL) - -dbus_monitor_SOURCES = \ - dbus-monitor.c \ - dbus-print-message.c \ - dbus-print-message.h \ - tool-common.c \ - tool-common.h \ - $(NULL) - -if DBUS_WIN -dbus_launch_SOURCES= \ - dbus-launch-win.c \ - dbus-launch.h -else -dbus_launch_SOURCES= \ - dbus-launch.c \ - dbus-launch-x11.c \ - dbus-launch.h \ - tool-common.c \ - tool-common.h \ - $(NULL) -endif - -dbus_launch_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - $(NULL) -dbus_launch_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(DBUS_X_LIBS) \ - $(NULL) - -dbus_run_session_SOURCES = \ - dbus-run-session.c \ - tool-common.c \ - tool-common.h - $(NULL) - -dbus_run_session_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-internal.la \ - $(NULL) - -dbus_cleanup_sockets_SOURCES= \ - dbus-cleanup-sockets.c - -dbus_uuidgen_SOURCES= \ - dbus-uuidgen.c - -dbus_send_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) - -dbus_monitor_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NETWORK_libs) \ - $(NULL) - -dbus_uuidgen_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) - -examplesdir = ${docdir}/examples -dist_examples_SCRIPTS = \ - GetAllMatchRules.py \ - $(NULL) - -dbus_test_tool_SOURCES = \ - dbus-echo.c \ - dbus-spam.c \ - tool-common.c \ - tool-common.h \ - test-tool.c \ - test-tool.h \ - $(NULL) -dbus_test_tool_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) - -dbus_update_activation_environment_SOURCES = \ - dbus-update-activation-environment.c \ - tool-common.c \ - tool-common.h \ - $(NULL) -dbus_update_activation_environment_LDADD = \ - $(CODE_COVERAGE_LIBS) \ - $(top_builddir)/dbus/libdbus-1.la \ - $(NULL) - -if DBUS_WIN -SUFFIXES = .rc - -.rc.o: - $(RC) $< -o $@ - -dbus_update_activation_environment_SOURCES += disable-uac.rc -endif - -EXTRA_DIST = run-with-tmp-session-bus.sh Win32.Manifest -CLEANFILES = \ - run-with-tmp-session-bus.conf \ - $(nodist_dbus_update_activation_environment_SOURCES) - -# create the /var/lib/dbus directory for dbus-uuidgen -install-data-local: - $(MKDIR_P) $(DESTDIR)$(localstatedir)/lib/dbus - -installcheck-local: - test -d $(DESTDIR)$(localstatedir)/lib/dbus - -EXTRA_DIST += build-timestamp.py -EXTRA_DIST += meson.build -EXTRA_DIST += meson-compat-install-emptydirs.py -EXTRA_DIST += meson-compat-install-symlink.py diff --git a/tools/ci-build.sh b/tools/ci-build.sh index d53b8bb4..239a69a3 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -75,8 +75,8 @@ init_wine() { } # ci_buildsys: -# Build system under test: autotools or cmake -: "${ci_buildsys:=autotools}" +# Build system under test: meson or cmake +: "${ci_buildsys:=meson}" # ci_compiler: # Compiler used to build dbus: gcc or clang @@ -151,31 +151,7 @@ maybe_fail_tests () { fi } -# Generate config.h.in and configure. We do this for both Autotools and -# CMake builds, so that the CMake build can compare config.h.in with its -# own checks. -NOCONFIGURE=1 ./autogen.sh - -case "$ci_buildsys" in - (cmake-dist|meson-dist) - # clean up directories from possible previous builds - rm -rf ci-build-dist - rm -rf src-from-dist - - # Do an Autotools `make dist`, then build *that* with CMake or Meson, - # to assert that our official release tarballs will be enough - # to build with CMake or Meson. - mkdir -p ci-build-dist - ( cd ci-build-dist; ../configure ) - make -C ci-build-dist dist - tar --xz -xvf ci-build-dist/dbus-1.*.tar.xz - mv dbus-1.*/ src-from-dist - srcdir="$(pwd)/src-from-dist" - ;; - (*) - srcdir="$(pwd)" - ;; -esac +srcdir="$(pwd)" # setup default ci_builddir, if not present if [ -z "$ci_builddir" ]; then @@ -252,77 +228,6 @@ make="${make} -j${ci_parallel} V=1 VERBOSE=1" export UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1 case "$ci_buildsys" in - (autotools) - case "$ci_variant" in - (debug) - # Full developer/debug build. - set _ "$@" - set "$@" --enable-developer --enable-tests - # Enable optional features that are off by default - case "$ci_host" in - *-w64-mingw32) - ;; - *) - set "$@" --enable-user-session - set "$@" SANITIZE_CFLAGS="-fsanitize=address -fsanitize=undefined -fPIE -pie" - ;; - esac - shift - # The test coverage for OOM-safety is too - # verbose to be useful on travis-ci. - export DBUS_TEST_MALLOC_FAILURES=0 - ;; - - (*) - ;; - esac - - case "$ci_host" in - (*-w64-mingw32) - set _ "$@" - set "$@" --build="$(build-aux/config.guess)" - set "$@" --host="${ci_host}" - set "$@" CFLAGS=-${ci_runtime}-libgcc - set "$@" CXXFLAGS=-${ci_runtime}-libgcc - # don't run tests yet, Wine needs Xvfb and - # more msys2 libraries - ci_test=no - # don't "make install" system-wide - ci_sudo=no - shift - ;; - esac - - ../configure \ - --enable-installed-tests \ - --enable-maintainer-mode \ - --enable-modular-tests \ - "$@" - - ${make} - [ "$ci_test" = no ] || ${make} check || maybe_fail_tests - cat test/test-suite.log || : - [ "$ci_test" = no ] || ${make} distcheck || maybe_fail_tests - - ${make} install DESTDIR=$(pwd)/DESTDIR - ( cd DESTDIR && find . -ls ) - - if [ "$ci_variant" != "production-no-upload-docs" ]; then - ${make} -C doc dbus-docs.tar.xz - tar -C $(pwd)/DESTDIR -xf doc/dbus-docs.tar.xz - ( cd DESTDIR/dbus-docs && find . -ls ) - fi - - if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ]; then - sudo ${make} install - sudo env LD_LIBRARY_PATH=/usr/local/lib \ - /usr/local/bin/dbus-uuidgen --ensure - LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \ - maybe_fail_tests - cat test/test-suite.log || : - fi - ;; - (cmake|cmake-dist) cmdwrapper= cmake=cmake @@ -552,7 +457,7 @@ case "$ci_buildsys" in esac case "$ci_buildsys" in - (autotools | meson*) + (meson*) if [ "$ci_sudo" = yes ] && [ "$ci_test" = yes ] && [ "$ci_host" = native ]; then sudo env LD_LIBRARY_PATH=/usr/local/lib \ /usr/local/bin/dbus-uuidgen --ensure diff --git a/tools/ci-install.sh b/tools/ci-install.sh index c8524a65..2f116ca0 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -129,9 +129,6 @@ case "$ci_distro" in packages=( "${packages[@]}" adduser - autoconf-archive - automake - autotools-dev ca-certificates ccache clang @@ -193,11 +190,7 @@ case "$ci_distro" in # build system packages=( "${packages[@]}" - autoconf - autoconf-archive - automake cmake - libtool meson ) @@ -303,9 +296,6 @@ case "$ci_distro" in $sudo pkg update $sudo pkg upgrade -y packages=( - autoconf - autoconf-archive - automake bash cmake docbook-xml @@ -314,7 +304,6 @@ case "$ci_distro" in glib git gmake - libtool libX11 libxslt meson |