diff options
author | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
---|---|---|
committer | Havoc Pennington <hp@redhat.com> | 2003-03-31 08:19:50 +0000 |
commit | 29c71168cd17b11eed65023c97aff401d5305b01 (patch) | |
tree | 431a05106d857cf38abbdea74a375326f395485e /configure.in | |
parent | bc86794f23fa538a405813fb61b531c2eacc9ae1 (diff) | |
download | dbus-29c71168cd17b11eed65023c97aff401d5305b01.tar.gz |
2003-03-31 Havoc Pennington <hp@pobox.com>
* dbus/dbus-transport-unix.c (_dbus_transport_new_for_domain_socket)
(_dbus_transport_new_for_tcp_socket): these didn't need the "server"
argument since they are always client side
* dbus/dbus-server.c (dbus_server_get_address): new function
* bus/main.c (main): take the configuration file as an argument.
* test/data/valid-config-files/debug-allow-all.conf: new file to
use with dispatch.c tests for example
* bus/test-main.c (main): require test data dir
* bus/bus.c (bus_context_new): change this to take a
configuration file name as argument
* doc/config-file.txt (Elements): add <servicedir>
* bus/system.conf, bus/session.conf: new files
* dbus/dbus-bus.c (dbus_bus_get): look for system bus on
well-known socket if none set
* configure.in: create system.conf and session.conf
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 39 |
1 files changed, 34 insertions, 5 deletions
diff --git a/configure.in b/configure.in index 81b316df..3714ca16 100644 --- a/configure.in +++ b/configure.in @@ -47,6 +47,8 @@ if test x$enable_asserts = xno; then AC_DEFINE(DBUS_DISABLE_ASSERT,1,[Disable assertion checking]) fi +#### gcc warning flags + if test "x$GCC" = "xyes"; then changequote(,)dnl case " $CFLAGS " in @@ -120,6 +122,8 @@ else fi fi +#### Assorted checks + AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(short) AC_CHECK_SIZEOF(long) @@ -350,9 +354,33 @@ dnl Qt flags AC_SUBST(DBUS_QT_CXXFLAGS) AC_SUBST(DBUS_QT_LIBS) +##### Set up location for system bus socket +## name of socket relative to localstatedir +DBUS_SYSTEM_SOCKET=run/dbus/system_bus_socket +AC_SUBST(DBUS_SYSTEM_SOCKET) + +#### find the actual value for $prefix that we'll end up with +REAL_PREFIX= +if test "x$prefix" = "xNONE"; then + REAL_PREFIX=$ac_default_prefix +else + REAL_PREFIX=$prefix +fi + +#### Have to go $localstatedir->$prefix/var->/usr/local/var +#### someone please fix this a better way... +LOCALSTATEDIR_TMP="$localstatedir" +old_prefix=$prefix +prefix=$REAL_PREFIX +EXPANDED_LOCALSTATEDIR=`eval echo $LOCALSTATEDIR_TMP` +prefix=$old_prefix +AC_SUBST(EXPANDED_LOCALSTATEDIR) + AC_OUTPUT([ -Makefile Doxyfile +bus/system.conf +bus/session.conf +Makefile dbus/Makefile glib/Makefile qt/Makefile @@ -381,17 +409,18 @@ echo " Building Qt bindings: ${have_qt} Building GLib bindings: ${have_glib} Using XML parser: ${with_xml} + System bus socket: ${EXPANDED_LOCALSTATEDIR}/${DBUS_SYSTEM_SOCKET} " if test x$enable_tests = xyes; then - echo "NOTE: building with unit tests increases the size of the installed library and renders it insecure" + echo "NOTE: building with unit tests increases the size of the installed library and renders it insecure." fi if test x$enable_gcov = xyes; then - echo "NOTE: building with coverage profiling is definitely for developers only" + echo "NOTE: building with coverage profiling is definitely for developers only." fi if test x$enable_verbose_mode = xyes; then - echo "NOTE: building with verbose mode increases library size and may slightly increase security risk, but aids debugging." + echo "NOTE: building with verbose mode increases library size, may slightly increase security risk, and may cause a slight performance decrease, but aids debugging." fi if test x$enable_asserts = xyes; then - echo "NOTE: building with assertions increases library size, but is probably a good idea anyway." + echo "NOTE: building with assertions increases library size, but will help a lot when tracking down bugs in software using D-BUS." fi |