AC_INIT(dbus/dbus.h)
-AM_INIT_AUTOMAKE(dbus, 0.32)
+AC_CANONICAL_TARGET
+
+AM_INIT_AUTOMAKE(dbus, 1.1.0)
AM_CONFIG_HEADER(config.h)
## must come before we use the $USE_MAINTAINER_MODE variable later
AM_MAINTAINER_MODE
-# libtool versioning - this applies to libhal and libhal-storage
+# libtool versioning - this applies to libdbus
#
# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
#
-LT_CURRENT=1
+
+## increment if the interface has additions, changes, removals.
+LT_CURRENT=5
+
+## increment any time the source changes; set to
+## 0 if you increment CURRENT
LT_REVISION=0
-LT_AGE=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=2
+
AC_SUBST(LT_CURRENT)
AC_SUBST(LT_REVISION)
AC_SUBST(LT_AGE)
AC_ISC_POSIX
AC_HEADER_STDC
-AC_ARG_ENABLE(qt, [ --enable-qt enable Qt-friendly client library],enable_qt=$enableval,enable_qt=auto)
-AC_ARG_ENABLE(glib, [ --enable-glib enable GLib-friendly client library],enable_glib=$enableval,enable_glib=auto)
-AC_ARG_ENABLE(gtk, [ --enable-gtk enable GTK-requiring executables],enable_gtk=$enableval,enable_gtk=auto)
-AC_ARG_ENABLE(tests, [ --enable-tests enable unit test code],enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(ansi, [ --enable-ansi enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
-AC_ARG_ENABLE(verbose-mode, [ --enable-verbose-mode support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(asserts, [ --enable-asserts include assertion checks],enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(checks, [ --enable-checks include sanity checks on public API],enable_checks=$enableval,enable_checks=yes)
-AC_ARG_ENABLE(xml-docs, [ --enable-xml-docs build XML documentation (requires xmlto)],enable_xml_docs=$enableval,enable_xml_docs=auto)
-AC_ARG_ENABLE(doxygen-docs, [ --enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)],enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
-AC_ARG_ENABLE(gcov, [ --enable-gcov compile with coverage profiling instrumentation (gcc only)],enable_gcov=$enableval,enable_gcov=no)
-AC_ARG_ENABLE(abstract-sockets, [ --enable-abstract-sockets use abstract socket namespace (linux only)],enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
-AC_ARG_ENABLE(gcj, [ --enable-gcj build gcj bindings],enable_gcj=$enableval,enable_gcj=no)
-AC_ARG_ENABLE(mono, [ --enable-mono build mono bindings],enable_mono=$enableval,enable_mono=auto)
-AC_ARG_ENABLE(mono_docs, [ --enable-mono-docs build mono docs],enable_mono_docs=$enableval,enable_mono_docs=auto)
-AC_ARG_ENABLE(python, [ --enable-python build python bindings],enable_python=$enableval,enable_python=auto)
-AC_ARG_ENABLE(selinux, [ --enable-selinux build with SELinux support],enable_selinux=$enableval,enable_selinux=auto)
-
-AC_ARG_WITH(xml, [ --with-xml=[libxml/expat] XML library to use])
-AC_ARG_WITH(init-scripts, [ --with-init-scripts=[redhat] Style of init scripts to install])
-AC_ARG_WITH(session-socket-dir, [ --with-session-socket-dir=[dirname] Where to put sockets for the per-login-session message bus])
-AC_ARG_WITH(test-socket-dir, [ --with-test-socket-dir=[dirname] Where to put sockets for make check])
-AC_ARG_WITH(system-pid-file, [ --with-system-pid-file=[pidfile] PID file for systemwide daemon])
-AC_ARG_WITH(system-socket, [ --with-system-socket=[filename] UNIX domain socket for systemwide daemon])
+AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
+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=$USE_MAINTAINER_MODE)
+AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
+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(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no)
+AC_ARG_ENABLE(abstract-sockets, AS_HELP_STRING([--enable-abstract-sockets],[use abstract socket namespace (linux only)]),enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
+AC_ARG_ENABLE(selinux, AS_HELP_STRING([--enable-selinux],[build with SELinux support]),enable_selinux=$enableval,enable_selinux=auto)
+AC_ARG_ENABLE(dnotify, AS_HELP_STRING([--enable-dnotify],[build with dnotify support (linux only)]),enable_dnotify=$enableval,enable_dnotify=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(userdb-cache, AS_HELP_STRING([--enable-userdb-cache],[build with userdb-cache support]),enable_userdb_cache=$enableval,enable_userdb_cache=yes)
+
+AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use]))
+AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install]))
+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-auth-dir, AS_HELP_STRING([--with-console-auth-dir=[dirname]],[directory to check for console ownerhip]))
+AC_ARG_WITH(console-owner-file, AS_HELP_STRING([--with-console-owner-file=[filename]],[file whose owner determines current console owner]))
+AC_ARG_WITH(dbus_user, AS_HELP_STRING([--with-dbus-user=<user>],[User for running the DBUS daemon (messagebus)]))
+AC_ARG_WITH(dbus_daemondir, AS_HELP_STRING([--with-dbus-daemondir=[dirname]],[Directory for installing the DBUS daemon]))
+
+AC_DEFINE(DBUS_UNIX,1,[dbus on unix])
dnl DBUS_BUILD_TESTS controls unit tests built in to .c files
dnl and also some stuff in the test/ subdir
if test x$enable_verbose_mode = xyes; then
AC_DEFINE(DBUS_ENABLE_VERBOSE_MODE,1,[Support a verbose mode])
fi
+
if test x$enable_asserts = xno; then
AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking])
AC_DEFINE(G_DISABLE_ASSERT,1,[Disable GLib assertion macros])
+ R_DYNAMIC_LDFLAG=""
+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])
fi
+if test x$enable_userdb_cache = xyes; then
+ AC_DEFINE(DBUS_ENABLE_USERDB_CACHE,1,[Build with caching of user data])
+fi
+
#### gcc warning flags
+cc_supports_flag() {
+ AC_MSG_CHECKING(whether $CC supports "$@")
+ Cfile=/tmp/foo${$}
+ touch ${Cfile}.c
+ $CC -c "$@" ${Cfile}.c -o ${Cfile}.o >/dev/null 2>&1
+ rc=$?
+ rm -f ${Cfile}.c ${Cfile}.o
+ case $rc in
+ 0) AC_MSG_RESULT(yes);;
+ *) AC_MSG_RESULT(no);;
+ esac
+ return $rc
+}
+
if test "x$GCC" = "xyes"; then
changequote(,)dnl
case " $CFLAGS " in
case " $CFLAGS " in
*[\ \ ]-Wfloat-equal[\ \ ]*) ;;
- *) CFLAGS="$CFLAGS -Wfloat-equal" ;;
+ *) if cc_supports_flag -Wfloat-equals; then
+ CFLAGS="$CFLAGS -Wfloat-equal"
+ fi
+ ;;
esac
case " $CFLAGS " in
*) CFLAGS="$CFLAGS -Wsign-compare" ;;
esac
+ case " $CFLAGS " in
+ *[\ \ ]-Wdeclaration-after-statement[\ \ ]*) ;;
+ *) if cc_supports_flag -Wdeclaration-after-statement; then
+ CFLAGS="$CFLAGS -Wdeclaration-after-statement"
+ fi
+ ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-fno-common[\ \ ]*) ;;
+ *) if cc_supports_flag -fno-common; then
+ CFLAGS="$CFLAGS -fno-common"
+ fi
+ ;;
+ esac
+
+ case " $CFLAGS " in
+ *[\ \ ]-fPIC[\ \ ]*) ;;
+ *) if cc_supports_flag -fPIC; then
+ CFLAGS="$CFLAGS -fPIC"
+ fi
+ ;;
+ esac
+
if test "x$enable_ansi" = "xyes"; then
case " $CFLAGS " in
*[\ \ ]-ansi[\ \ ]*) ;;
fi
fi
-#### can't use AM_PROG_GCJ since it fails fatally if no gcj found
-AC_CHECK_PROGS(GCJ, gcj, gcj)
-if test -z "$GCJ" ; then
- have_gcj=no
-else
- # Needs to be here so libtool wont get confused
- AM_PROG_GCJ
-
- have_gcj=yes
- if test "x${GCJFLAGS-unset}" = xunset; then
- GCJFLAGS="-g -O2 -Wall"
- fi
- AC_SUBST(GCJFLAGS)
-fi
-
-if test x$enable_gcj = xauto ; then
- if test x$have_gcj = xno ; then
- enable_gcj=no
- else
- enable_gcj=yes
- fi
-fi
-
-if test x$enable_gcj = xyes; then
- if test x$have_gcj = xno ; then
- AC_MSG_ERROR([Building gcj explicitly required, but gcj not found])
- fi
-fi
-
-AM_CONDITIONAL(DBUS_USE_GCJ, test x$enable_gcj = xyes)
-
+# Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris
+#
+case $target_os in
+ solaris*)
+ CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS" ;;
+esac
+
AM_PROG_LIBTOOL
-#### Look for mono
-MONO_REQUIRED_VERSION=0.95
-AC_SUBST(MONO_REQUIRED_VERSION)
-PKG_CHECK_MODULES(MONO_DEPENDENCY, mono >= $MONO_REQUIRED_VERSION, have_mono=true, have_mono=false)
-
-if test "x$enable_mono" = "xyes"; then
- if test "x$have_mono" = "xfalse"; then
- AC_MSG_ERROR([Mono was not found])
- fi
-fi
-
-if test "x$have_mono" = "xtrue"; then
- if test `uname -s` = "Darwin"; then
- AC_PATH_PROG(RUNTIME, mint, no)
- AC_PATH_PROG(CSC, mcs, no)
- LIB_PREFIX=
- LIB_SUFFIX=.dylib
- else
- AC_PATH_PROG(RUNTIME, mono, no)
- AC_PATH_PROG(CSC, mcs, no)
- LIB_PREFIX=.so
- LIB_SUFFIX=
- fi
-else
- AC_PATH_PROG(CSC, csc.exe, no)
- RUNTIME=
- LIB_PREFIX=
- LIB_SUFFIX=.dylib
-fi
-
-if test x$enable_mono = xyes; then
- if test x$have_mcs = xno ; then
- AC_MSG_ERROR([Building Mono bindings explicitly required, but mcs compiler not found])
- fi
-
- ### Test for GACUTIL
- AC_PATH_PROG(GACUTIL, gacutil, no)
- if test "x$GACUTIL" = "xno" ; then
- AC_MSG_ERROR([No gacutil tool found])
- fi
-
- AC_SUBST(GACUTIL)
-fi
-
-if test x$enable_mono = xauto ; then
- if test x$CSC = xno ; then
- enable_mono=no
- else
- ### Test for GACUTIL
- AC_PATH_PROG(GACUTIL, gacutil, no)
- if test "x$GACUTIL" = "xno" ; then
- enable_mono=no
- else
- enable_mono=yes
- fi
- fi
-fi
-
-AC_SUBST(RUNTIME)
-AC_SUBST(CSC)
-AC_SUBST(GACUTIL)
-AC_SUBST(LIB_PREFIX)
-AC_SUBST(LIB_SUFFIX)
-
-AM_CONDITIONAL(DBUS_USE_CSC, test x$enable_mono = xyes)
-
-#### Look for monodoc
-MONODOC_REQUIRED_VERSION=0.16
-AC_SUBST(MONODOC_REQUIRED_VERSION)
-PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, have_monodoc=yes, have_monodoc=no)
-
-if test x$enable_mono_docs = xyes; then
- if test x$have_monodoc = xno ; then
- AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
- else
- AC_PATH_PROG(MONODOC, monodoc, no)
- if test x$MONODOC = xno; then
- AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
- fi
- fi
-fi
-
-if test x$enable_mono_docs = xauto ; then
- if test x$have_monodoc = xno ; then
- enable_mono_docs=no
- MONODOC=
- else
- AC_PATH_PROG(MONODOC, monodoc, no)
- if test x$MONODOC = xno; then
- enable_mono_docs=no
- MONODOC=
- else
- enable_mono_docs=yes
- fi
- fi
-fi
-
-AC_SUBST(MONODOC)
-
-AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_mono_docs" = "xyes")
-
changequote(,)dnl
-# let ourselves use our own unstable API
-CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS"
# compress spaces in flags
CFLAGS=`echo "$CFLAGS" | sed -e 's/ +/ /g'`
CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ +/ /g'`
AC_SUBST(DBUS_INT16_TYPE)
## byte order
-AC_C_BIGENDIAN
-
+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
dnl **********************************
dnl *** va_copy checks (from GLib) ***
AC_DEFINE_UNQUOTED(DBUS_VA_COPY,$dbus_va_copy_func,[A 'va_copy' style function])
fi
-AC_CACHE_CHECK([whether va_lists can be copied by value],dbus_cv_va_val_copy,[
- AC_TRY_RUN([#include <stdarg.h>
+AC_LANG_PUSH(C)
+AC_CACHE_CHECK([whether va_lists can be copied by value],
+ dbus_cv_va_val_copy,
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[
+ #include <stdarg.h>
+]],
+[[
void f (int i, ...) {
va_list args1, args2;
va_start (args1, i);
int main() {
f (0, 42);
return 0;
- }],
+ }
+]])],
[dbus_cv_va_val_copy=yes],
[dbus_cv_va_val_copy=no],
[dbus_cv_va_val_copy=yes])
])
+AC_LANG_POP(C)
if test "x$dbus_cv_va_val_copy" = "xno"; then
AC_DEFINE(DBUS_VA_COPY_AS_ARRAY,1, ['va_lists' cannot be copies as values])
AC_MSG_RESULT([no])
;;
i?86)
- AC_MSG_RESULT([i486])
- AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
+ case $host_os in
+ darwin*)
+ AC_MSG_RESULT([darwin])
+ # check at compile-time, so that it is possible to build universal
+ # (with multiple architectures at once on the compile line)
+ AH_VERBATIM([DBUS_USE_ATOMIC_INT_486_DARWIN], [
+ #if (defined(__i386__) || defined(__x86_64__))
+ # define DBUS_USE_ATOMIC_INT_486 1
+ #endif
+ ])
+ ;;
+ *)
+ AC_MSG_RESULT([i486])
+ AC_DEFINE_UNQUOTED(DBUS_USE_ATOMIC_INT_486, 1, [Use atomic integer implementation for 486])
+ ;;
+ esac
have_atomic_inc=yes
;;
*)
fi
fi
if test x$have_atomic_inc = xyes ; then
- AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])
+ case $host_os in
+ darwin*)
+ AH_VERBATIM([DBUS_HAVE_ATOMIC_INT_DARWIN], [
+ #if (defined(__i386__) || defined(__x86_64__))
+ # define DBUS_HAVE_ATOMIC_INT 1
+ #endif
+ ])
+ ;;
+ *)
+ AC_DEFINE_UNQUOTED(DBUS_HAVE_ATOMIC_INT, 1, [Some atomic integer implementation present])
+ ;;
+ esac
fi
#### Various functions
AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(nsl,gethostbyname)
+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
-AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist)
+AC_CHECK_FUNCS(vsnprintf vasprintf nanosleep usleep poll setenv unsetenv socketpair getgrouplist fpathconf setrlimit)
+
+AC_MSG_CHECKING(for dirfd)
+AC_TRY_LINK([
+#include <sys/types.h>
+#include <dirent.h>
+],[
+DIR *dirp;
+dirp = opendir(".");
+dirfd(dirp);
+closedir(dirp);
+],
+dbus_have_dirfd=yes, dbus_have_dirfd=no)
+AC_MSG_RESULT($dbus_have_dirfd)
+if test "$dbus_have_dirfd" = yes; then
+ AC_DEFINE(HAVE_DIRFD,1,[Have dirfd function])
+else
+ AC_MSG_CHECKING(for DIR *dirp->dd_fd)
+ AC_TRY_LINK([
+#include <sys/types.h>
+#include <dirent.h>
+ ],[
+DIR *dirp;
+int fd;
+dirp = opendir(".");
+fd = dirp->dd_fd;
+closedir(dirp);
+ ],
+ dbus_have_ddfd=yes, dbus_have_ddfd=no)
+ AC_MSG_RESULT($dbus_have_ddfd)
+ if test "$dbus_have_ddfd" = yes; then
+ AC_DEFINE(HAVE_DDFD,1,[Have the ddfd member of DIR])
+ fi
+fi
AC_CHECK_HEADERS(execinfo.h, [AC_CHECK_FUNCS(backtrace)])
+AC_CHECK_HEADERS(errno.h)
+
+AC_CHECK_HEADERS(unistd.h)
+
+# checking for a posix version of getpwnam_r
+# if we are cross compiling and can not run the test
+# assume getpwnam_r is the posix version
+# it is up to the person cross compiling to change
+# this behavior if desired
+AC_LANG_PUSH(C)
AC_CACHE_CHECK([for posix getpwnam_r],
ac_cv_func_posix_getpwnam_r,
- [AC_TRY_RUN([
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM(
+[[
#include <errno.h>
#include <pwd.h>
-int main () {
+]],
+[[
char buffer[10000];
struct passwd pwd, *pwptr = &pwd;
int error;
sizeof (buffer), &pwptr);
return (error < 0 && errno == ENOSYS)
|| error == ENOSYS;
-} ],
+]])],
[ac_cv_func_posix_getpwnam_r=yes],
- [ac_cv_func_posix_getpwnam_r=no])])
+ [ac_cv_func_posix_getpwnam_r=no],
+ [ac_cv_func_posix_getpwnam_r=yes]
+)])
+AC_LANG_POP(C)
+
if test "$ac_cv_func_posix_getpwnam_r" = yes; then
AC_DEFINE(HAVE_POSIX_GETPWNAM_R,1,
[Have POSIX function getpwnam_r])
dnl good to go if HAVE_WRITEV gets defined.
AC_CHECK_HEADERS(sys/uio.h, [AC_CHECK_FUNCS(writev)])
+dnl needed on darwin for NAME_MAX
+AC_CHECK_HEADERS(sys/syslimits.h)
+
dnl check for flavours of varargs macros (test from GLib)
AC_MSG_CHECKING(for ISO C99 varargs macros in C)
AC_TRY_COMPILE([],[
AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure])
fi
+AC_CHECK_FUNCS(getpeerucred getpeereid)
#### Abstract sockets
-AC_MSG_CHECKING(abstract socket namespace)
AC_LANG_PUSH(C)
-AC_RUN_IFELSE([AC_LANG_PROGRAM(
+AC_CACHE_CHECK([abstract socket namespace],
+ ac_cv_have_abstract_sockets,
+ [AC_RUN_IFELSE([AC_LANG_PROGRAM(
[[
#include <sys/types.h>
#include <stdlib.h>
else
exit (0);
]])],
- [have_abstract_sockets=yes],
- [have_abstract_sockets=no])
+ [ac_cv_have_abstract_sockets=yes],
+ [ac_cv_have_abstract_sockets=no]
+)])
AC_LANG_POP(C)
-AC_MSG_RESULT($have_abstract_sockets)
if test x$enable_abstract_sockets = xyes; then
- if test x$have_abstract_sockets = xno; then
+ if test x$ac_cv_have_abstract_sockets = xno; then
AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.])
fi
fi
if test x$enable_abstract_sockets = xno; then
- have_abstract_sockets=no;
+ ac_cv_have_abstract_sockets=no;
fi
-if test x$have_abstract_sockets = xyes ; then
+if test x$ac_cv_have_abstract_sockets = xyes ; then
DBUS_PATH_OR_ABSTRACT=abstract
AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
else
#### Sort out XML library
# see what we have
-AC_CHECK_LIB(expat, XML_ParserCreate_MM,
+AC_CHECK_LIB(expat, XML_ParserCreate_MM,
[ AC_CHECK_HEADERS(expat.h, have_expat=true, have_expat=false) ],
have_expat=false)
-PKG_CHECK_MODULES(LIBXML, libxml-2.0, have_libxml=true, have_libxml=false)
+PKG_CHECK_MODULES(LIBXML, libxml-2.0 >= 2.6.0, have_libxml=true, have_libxml=false)
# see what we want to use
dbus_use_libxml=false
XML_CFLAGS=$LIBXML_CFLAGS
fi
+# Thread lib detection
+AC_CHECK_FUNC(pthread_cond_timedwait,,[AC_CHECK_LIB(pthread,pthread_cond_timedwait,
+ [THREAD_LIBS="-lpthread"])])
+
# SELinux detection
if test x$enable_selinux = xno ; then
have_selinux=no;
AC_CHECK_LIB(selinux, is_selinux_enabled,
have_selinux=yes, have_selinux=no)
- # see if we have the SELinux header with the new D-BUS stuff in it
+ # see if we have the SELinux header with the new D-Bus stuff in it
if test x$have_selinux = xyes ; then
AC_MSG_CHECKING([for DBUS Flask permissions in selinux/av_permissions.h])
AC_TRY_COMPILE([#include <selinux/av_permissions.h>],
AM_CONDITIONAL(HAVE_SELINUX, test x$have_selinux = xyes)
if test x$have_selinux = xyes ; then
- SELINUX_LIBS="-lselinux -lpthread"
+ # 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="-lselinux $SELINUX_THREAD_LIBS"
AC_DEFINE(HAVE_SELINUX,1,[SELinux support])
else
SELINUX_LIBS=
fi
-#### Set up final flags
-DBUS_CLIENT_CFLAGS=
-DBUS_CLIENT_LIBS=
-AC_SUBST(DBUS_CLIENT_CFLAGS)
-AC_SUBST(DBUS_CLIENT_LIBS)
-
-DBUS_BUS_CFLAGS=$XML_CFLAGS
-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS"
-AC_SUBST(DBUS_BUS_CFLAGS)
-AC_SUBST(DBUS_BUS_LIBS)
-
-DBUS_TEST_CFLAGS=
-DBUS_TEST_LIBS=
-AC_SUBST(DBUS_TEST_CFLAGS)
-AC_SUBST(DBUS_TEST_LIBS)
-
-# Glib detection
-PKG_CHECK_MODULES(DBUS_GLIB, gobject-2.0, have_glib=yes, have_glib=no)
-PKG_CHECK_MODULES(DBUS_GLIB_THREADS, glib-2.0 gthread-2.0, have_glib_threads=yes, have_glib_threads=no)
-
-if test x$have_glib = xno ; then
- AC_MSG_WARN([GLib development libraries not found])
-fi
-
-if test x$enable_glib = xyes; then
- if test x$have_glib = xno; then
- AC_MSG_ERROR([GLib explicitly required, and GLib development libraries not found])
+# dnotify checks
+if test x$enable_dnotify = xno ; then
+ have_dnotify=no;
+else
+ if test x$target_os = xlinux-gnu -o x$target_os = xlinux; then
+ have_dnotify=yes;
+ else
+ have_dnotify=no;
fi
fi
-if test x$enable_glib = xno; then
- have_glib=no;
+dnl check if dnotify backend is enabled
+if test x$have_dnotify = xyes; then
+ AC_DEFINE(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX,1,[Use dnotify on Linux])
fi
-AM_CONDITIONAL(HAVE_GLIB, test x$have_glib = xyes)
-AM_CONDITIONAL(HAVE_GLIB_THREADS, test x$have_glib_threads = xyes)
+AM_CONDITIONAL(DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX, test x$have_dnotify = xyes)
-if test x$have_glib = xyes; then
- GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
-else
- GLIB_GENMARSHAL=glib-not-enabled-so-there-is-no-genmarshal
-fi
-AC_SUBST(GLIB_GENMARSHAL)
-
-dnl GLib flags
-AC_SUBST(DBUS_GLIB_CFLAGS)
-AC_SUBST(DBUS_GLIB_LIBS)
-AC_SUBST(DBUS_GLIB_THREADS_LIBS)
-
-DBUS_GLIB_TOOL_CFLAGS=$XML_CFLAGS
-DBUS_GLIB_TOOL_LIBS=$XML_LIBS
-AC_SUBST(DBUS_GLIB_TOOL_CFLAGS)
-AC_SUBST(DBUS_GLIB_TOOL_LIBS)
-
-# GTK detection
-if test x$have_glib = xno ; then
- AC_MSG_WARN([Can't use GTK+ since GLib not enabled])
- have_gtk=no
+# kqueue checks
+if test x$enable_kqueue = xno ; then
+ have_kqueue=no
else
- PKG_CHECK_MODULES(DBUS_GTK, gtk+-2.0, have_gtk=yes, have_gtk=no)
- PKG_CHECK_MODULES(DBUS_GTK_THREADS, gtk+-2.0 gthread-2.0, have_gtk_threads=yes, have_gtk_threads=no)
-fi
-
-if test x$have_gtk = xno ; then
- AC_MSG_WARN([GTK+ development libraries not found])
-fi
+ have_kqueue=yes
+ AC_CHECK_HEADER(sys/event.h, , have_kqueue=no)
+ AC_CHECK_FUNC(kqueue, , have_kqueue=no)
-if test x$enable_gtk = xyes; then
- if test x$have_gtk = xno; then
- AC_MSG_ERROR([GTK+ explicitly required, and GTK+ development libraries not found])
+ if test x$enable_kqueue = xyes -a x$have_kqueue = xno; then
+ AC_MSG_ERROR(kqueue support explicitly enabled but not available)
fi
fi
-if test x$enable_gtk = xno; then
- have_gtk=no;
+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(HAVE_GTK, test x$have_gtk = xyes)
-
-dnl Gtk flags
-AC_SUBST(DBUS_GTK_CFLAGS)
-AC_SUBST(DBUS_GTK_LIBS)
-AC_SUBST(DBUS_GTK_THREADS_CFLAGS)
-AC_SUBST(DBUS_GTK_THREADS_LIBS)
-
-# Qt detection
-AC_PATH_PROG(QT_MOC, moc, no)
-
-have_qt=no
-AC_MSG_CHECKING([for qglobal.h])
-if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
- have_qt=yes
- DBUS_QT_CXXFLAGS="-I$QTDIR/include"
-else
- for dir in "${prefix}/include/qt" "/usr/include/qt-3.1" "/usr/include/qt3" "/usr/include/qt" "/usr/lib/qt/include" "/usr/lib/qt-3.1/include"; do
- if test -f "$dir/qglobal.h"; then
- have_qt=yes
- DBUS_QT_CXXFLAGS="-I$dir"
- fi
- done
-fi
-if test x"$have_qt" = x"yes"; then
- AC_MSG_RESULT([found])
-else
- AC_MSG_RESULT([not found])
-fi
+AM_CONDITIONAL(DBUS_BUS_ENABLE_KQUEUE, test x$have_kqueue = xyes)
-dnl linking to kdecore will give us a bit of help from libtool
-if (! kde-config >& /dev/null); then
- have_qt=no
+dnl console owner file
+if test x$enable_console_owner_file = xno ; then
+ have_console_owner_file=no;
else
- kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
- if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
- have_qt=no
- else
- DBUS_QT_LIBS="$kdelibs/libkdecore.la"
- fi
-fi
-
-if test x$have_qt = xno ; then
- AC_MSG_WARN([Qt development libraries not found])
+ case $target_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
-if test x$enable_qt = xyes; then
- if test x$have_qt = xno; then
- AC_MSG_ERROR([Qt integration explicitly required, and Qt libraries not found])
- fi
-fi
+AM_CONDITIONAL(HAVE_CONSOLE_OWNER_FILE, test x$have_console_owner_file = xyes)
-if test x$enable_qt = xno; then
- have_qt=no;
-fi
+#### Set up final flags
+DBUS_CLIENT_CFLAGS=
+DBUS_CLIENT_LIBS="$THREAD_LIBS"
+AC_SUBST(DBUS_CLIENT_CFLAGS)
+AC_SUBST(DBUS_CLIENT_LIBS)
-AM_CONDITIONAL(HAVE_QT, test x$have_qt = xyes)
+DBUS_BUS_CFLAGS=$XML_CFLAGS
+DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $THREAD_LIBS"
+AC_SUBST(DBUS_BUS_CFLAGS)
+AC_SUBST(DBUS_BUS_LIBS)
-dnl Qt flags
-AC_SUBST(DBUS_QT_CXXFLAGS)
-AC_SUBST(DBUS_QT_LIBS)
+DBUS_TEST_CFLAGS=
+DBUS_TEST_LIBS="$THREAD_LIBS"
+AC_SUBST(DBUS_TEST_CFLAGS)
+AC_SUBST(DBUS_TEST_LIBS)
### X11 detection
AC_PATH_XTRA
AM_CONDITIONAL(DBUS_XML_DOCS_ENABLED, test x$enable_xml_docs = xyes)
AC_MSG_RESULT(yes)
-#### Have to go $localstatedir->$prefix/var->/usr/local/var
-#### someone please fix this a better way...
+#### 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)
-REAL_PREFIX=
-if test "x$prefix" = "xNONE"; then
- REAL_PREFIX=$ac_default_prefix
-else
- REAL_PREFIX=$prefix
-fi
-
-## temporarily change prefix and exec_prefix
-old_prefix=$prefix
-prefix=$REAL_PREFIX
-
-if test "x$exec_prefix" = xNONE ; then
- REAL_EXEC_PREFIX=$REAL_PREFIX
-else
- REAL_EXEC_PREFIX=$exec_prefix
-fi
-old_exec_prefix=$exec_prefix
-exec_prefix=$REAL_EXEC_PREFIX
-
-## eval everything
-LOCALSTATEDIR_TMP="$localstatedir"
-EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP`
-AC_SUBST(EXPANDED_LOCALSTATEDIR)
-
-SYSCONFDIR_TMP="$sysconfdir"
-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
-AC_SUBST(EXPANDED_SYSCONFDIR)
-
-BINDIR_TMP="$bindir"
-EXPANDED_BINDIR=`eval echo $BINDIR_TMP`
-AC_SUBST(EXPANDED_BINDIR)
-
-LIBDIR_TMP="$libdir"
-EXPANDED_LIBDIR=`eval echo $LIBDIR_TMP`
-AC_SUBST(EXPANDED_LIBDIR)
-
-DATADIR_TMP="$datadir"
-EXPANDED_DATADIR=`eval echo $DATADIR_TMP`
-AC_SUBST(EXPANDED_DATADIR)
-
-## put prefix and exec_prefix back
-prefix=$old_prefix
-exec_prefix=$old_exec_prefix
+AS_AC_EXPAND(EXPANDED_LOCALSTATEDIR, "$localstatedir")
+AS_AC_EXPAND(EXPANDED_SYSCONFDIR, "$sysconfdir")
+AS_AC_EXPAND(EXPANDED_BINDIR, "$bindir")
+AS_AC_EXPAND(EXPANDED_LIBDIR, "$libdir")
+AS_AC_EXPAND(EXPANDED_DATADIR, "$datadir")
#### Check our operating system
operating_system=unknown
## on an abstract socket (so only root can create the socket)
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])
+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
-elif test x$operating_system = xredhat ; then
+elif test x$with_init_scripts = xredhat ; then
DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/messagebus.pid
else
DBUS_SYSTEM_PID_FILE=${EXPANDED_LOCALSTATEDIR}/run/dbus/pid
AC_SUBST(DBUS_SYSTEM_PID_FILE)
+#### Directory to check for console ownership
+if ! test -z "$with_console_auth_dir"; then
+ DBUS_CONSOLE_AUTH_DIR=$with_console_auth_dir
+else
+ DBUS_CONSOLE_AUTH_DIR=/var/run/console/
+fi
+
+AC_SUBST(DBUS_CONSOLE_AUTH_DIR)
+AC_DEFINE_UNQUOTED(DBUS_CONSOLE_AUTH_DIR, "$DBUS_CONSOLE_AUTH_DIR", [Directory to check for console ownerhip])
+
+#### 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])
+
+#### 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
+else
+ DBUS_DAEMONDIR=$with_dbus_daemondir
+fi
+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])
+
#### Tell tests where to find certain stuff in builddir
-ABSOLUTE_TOP_BUILDDIR=`cd ${ac_top_builddir}. && pwd`
-AC_DEFUN(TEST_PATH, [
-TEST_$1=${ABSOLUTE_TOP_BUILDDIR}/test/$2
+DBUS_PWD=`pwd`
+AC_DEFUN([TEST_PATH], [
+TEST_$1=${DBUS_PWD}/test/$2
AC_DEFINE_UNQUOTED(TEST_$1, "$TEST_$1",
[Full path to test file test/$2 in builddir])
AC_SUBST(TEST_$1)
TEST_PATH(SERVICE_DIR, data/valid-service-files)
TEST_PATH(SERVICE_BINARY, test-service)
-TEST_PATH(GLIB_SERVICE_BINARY, glib/test-service-glib)
+TEST_PATH(SHELL_SERVICE_BINARY, test-shell-service)
TEST_PATH(EXIT_BINARY, test-exit)
TEST_PATH(SEGFAULT_BINARY, test-segfault)
TEST_PATH(SLEEP_FOREVER_BINARY, test-sleep-forever)
-AC_SUBST(ABSOLUTE_TOP_BUILDDIR)
+
+AC_DEFINE_UNQUOTED(TEST_BUS_BINARY, "$DBUS_PWD/bus/dbus-daemon",
+ [Full path to the daemon in the builddir])
+AC_SUBST(TEST_BUS_BINARY)
#### Find socket directories
if ! test -z "$TMPDIR" ; then
AC_DEFINE_UNQUOTED(DBUS_SESSION_SOCKET_DIR, "$DBUS_SESSION_SOCKET_DIR", [Where per-session bus puts its sockets])
AC_SUBST(DBUS_SESSION_SOCKET_DIR)
-# Detect if we can build Python bindings (need python, python headers, and pyrex)
-if test x$enable_python = xno; then
- have_python=no
-else
- AC_MSG_NOTICE([Checking to see if we can build Python bindings])
- have_python=no
- AM_PATH_PYTHON(2.2)
-
- if test -z "$PYTHON" ; then
- AC_MSG_WARN([Python not found])
- else
- AC_CHECK_PROGS(PYREX, pyrexc)
-
- if test -z "$PYREX" ; then
- have_pyrex=no
- else
- have_pyrex=yes
- fi
-
- AM_CHECK_PYTHON_HEADERS(have_python_headers=yes,have_python_headers=no)
-
- if test x$have_pyrex = xyes -a x$have_python_headers = xyes ; then
- have_python=yes
- fi
- fi
-
- if test x$have_python = xno ; then
- if test x$enable_python = xyes ; then
- AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings])
- else
- AC_MSG_WARN([Couldn't find either Pyrex or the Python headers, not building Python bindings])
- fi
- fi
-fi
-
-AM_CONDITIONAL(HAVE_PYTHON, test x$have_python = xyes)
-
AC_OUTPUT([
Doxyfile
dbus/dbus-arch-deps.h
bus/dbus-daemon.1
Makefile
dbus/Makefile
-glib/Makefile
-python/Makefile
-python/examples/Makefile
-qt/Makefile
-gcj/Makefile
-gcj/org/Makefile
-gcj/org/freedesktop/Makefile
-gcj/org/freedesktop/dbus/Makefile
-mono/Makefile
-mono/AssemblyInfo.cs
-mono/dbus-sharp.dll.config
-mono/example/Makefile
-mono/doc/Makefile
bus/Makefile
tools/Makefile
test/Makefile
-test/glib/Makefile
+test/name-test/Makefile
doc/Makefile
dbus-1.pc
-dbus-glib-1.pc
-dbus-sharp.pc
test/data/valid-config-files/debug-allow-all.conf
test/data/valid-config-files/debug-allow-all-sha1.conf
test/data/valid-service-files/debug-echo.service
test/data/valid-service-files/debug-segfault.service
-test/data/valid-service-files/debug-glib.service
+test/data/valid-service-files/debug-shell-echo-success.service
+test/data/valid-service-files/debug-shell-echo-fail.service
])
-### FIXME it's bizarre that have_qt and have_glib are used
-### instead of enable_ - should fix things so that enable
-### is always whether it's enabled, and have is always whether
-### it was found.
-
dnl ==========================================================================
echo "
- D-BUS $VERSION
+ D-Bus $VERSION
==============
prefix: ${prefix}
bindir: ${EXPANDED_BINDIR}
sysconfdir: ${EXPANDED_SYSCONFDIR}
localstatedir: ${EXPANDED_LOCALSTATEDIR}
- datadir: ${EXPANDED_DATADIR}
+ datadir: ${EXPANDED_DATADIR}
source code location: ${srcdir}
compiler: ${CC}
cflags: ${CFLAGS}
Doxygen: ${DOXYGEN}
xmlto: ${XMLTO}"
-if test x$enable_gcj = xyes ; then
-echo \
-" gcj: ${GCJ}
- gcjflags: ${GCJFLAGS}"
-else
-echo \
-" gcj: (not enabled)"
-fi
-
-if test x$enable_mono = xyes ; then
-echo \
-" csc: ${CSC}
-"
-else
-echo \
-" csc: (not enabled)
-"
-fi
-
echo "
Maintainer mode: ${USE_MAINTAINER_MODE}
gcc coverage profiling: ${enable_gcov}
Building verbose mode: ${enable_verbose_mode}
Building assertions: ${enable_asserts}
Building checks: ${enable_checks}
- Building Qt bindings: ${have_qt}
- Building GLib bindings: ${have_glib}
- Building Python bindings: ${have_python}
Building SELinux support: ${have_selinux}
- Building Mono bindings: ${enable_mono}
- Building Mono docs: ${enable_mono_docs}
- Building GTK+ tools: ${have_gtk}
+ Building dnotify support: ${have_dnotify}
Building X11 code: ${enable_x11}
Building Doxygen docs: ${enable_doxygen_docs}
Building XML docs: ${enable_xml_docs}
+ Building cache support: ${enable_userdb_cache}
+ Gettext libs (empty OK): ${INTLLIBS}
Using XML parser: ${with_xml}
Init scripts style: ${with_init_scripts}
- Abstract socket names: ${have_abstract_sockets}
+ Abstract socket names: ${ac_cv_have_abstract_sockets}
System bus socket: ${DBUS_SYSTEM_SOCKET}
System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS}
System bus PID file: ${DBUS_SYSTEM_PID_FILE}
Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR}
+ Console auth dir: ${DBUS_CONSOLE_AUTH_DIR}
+ 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}
"
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."
+ 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