mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-01-02 22:40:20 +01:00
d8155bf51b
* configure.in (LT_CURRENT, LT_AGE): increment current and age to reflect addition of interfaces. * doc/dbus-specification.xml: describe a new org.freedesktop.DBus.Peer.GetMachineId method * dbus/dbus-string.c (_dbus_string_skip_white_reverse): new function (_dbus_string_skip_white, _dbus_string_skip_blank): use new DBUS_IS_ASCII_BLANK, DBUS_IS_ASCII_WHITE macros and fix assertion at end of skip_white (_dbus_string_chop_white): new function * bus/connection.c (bus_connections_setup_connection): call dbus_connection_set_route_peer_messages. * dbus/dbus-connection.c (_dbus_connection_peer_filter_unlocked_no_update): modify to support a GetMachineId method. Also, support a new flag to let the bus pass peer methods through to apps on the bus, which can be set with dbus_connection_set_route_peer_messages. Finally, handle and return an error for anything unknown on the Peer interface, which will allow us to extend the Peer interface in the future without fear that we're now intercepting something apps were wanting to see. * tools/dbus-uuidgen.c: a thin wrapper around the functions in dbus/dbus-uuidgen.c * dbus/dbus-uuidgen.c: implement the bulk of the dbus-uuidgen binary here, since most of the code is already in libdbus * dbus/dbus-sysdeps.c (_dbus_read_local_machine_uuid): read the uuid from the system config file * dbus/dbus-internals.c (_dbus_generate_uuid, _dbus_uuid_encode) (_dbus_read_uuid_file_without_creating) (_dbus_create_uuid_file_exclusively, _dbus_read_uuid_file): new uuid-related functions, partly factored out from dbus-server.c * dbus/dbus-sysdeps.c (_dbus_error_from_errno): convert EEXIST to DBUS_ERROR_FILE_EXISTS instead of EEXIST * dbus/dbus-protocol.h (DBUS_ERROR_FILE_EXISTS): add file exists error * tools/dbus-cleanup-sockets.1: explain what the point of this thing is a bit more * autogen.sh (run_configure): add --config-cache to default configure args * dbus/dbus-internals.h (_DBUS_ASSERT_ERROR_IS_SET): disable the error set/clear assertions when DBUS_DISABLE_CHECKS is defined * tools/dbus-launch.c (main): if xdisplay hasn't been opened, don't try to save address, fixes crash in make check
93 lines
2 KiB
Bash
Executable file
93 lines
2 KiB
Bash
Executable file
#!/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
|
|
|
|
(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
|
|
}
|
|
|
|
AUTOMAKE=automake-1.9
|
|
ACLOCAL=aclocal-1.9
|
|
|
|
($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 --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
|
|
|
|
echo $ACLOCAL $ACLOCAL_FLAGS
|
|
$ACLOCAL $ACLOCAL_FLAGS
|
|
|
|
## optionally feature autoheader
|
|
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
|
|
|
|
$AUTOMAKE -a $am_opt
|
|
autoconf || echo "autoconf failed - version 2.5x is probably required"
|
|
|
|
cd $ORIGDIR
|
|
|
|
run_configure=true
|
|
for arg in $*; do
|
|
case $arg in
|
|
--no-configure)
|
|
run_configure=false
|
|
;;
|
|
*)
|
|
;;
|
|
esac
|
|
done
|
|
|
|
if $run_configure; then
|
|
$srcdir/configure --enable-maintainer-mode --config-cache "$@"
|
|
echo
|
|
echo "Now type 'make' to compile $PROJECT."
|
|
else
|
|
echo
|
|
echo "Now run 'configure' and 'make' to compile $PROJECT."
|
|
fi
|
|
|