summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn (J5) Palmieri <johnp@redhat.com>2006-04-24 15:28:42 +0000
committerJohn (J5) Palmieri <johnp@redhat.com>2006-04-24 15:28:42 +0000
commit63b74faa74c7616bcd8a579f36b08043f54056a4 (patch)
treeca17d114700c3294b00c32be552e2480fffad8a4
parent21a1fcbc0acc2d640374fa537d73b7d75d9bf042 (diff)
2006-04-24 John (J5) Palmieri <johnp@redhat.com>
* README, INSTALL: Doc fixes Patch from Brad Hards <bradh at frogmouth.net>
-rw-r--r--ChangeLog5
-rw-r--r--INSTALL7
-rw-r--r--README43
3 files changed, 42 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c9069f0..e7065766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-24 John (J5) Palmieri <johnp@redhat.com>
+
+ * README, INSTALL: Doc fixes
+ Patch from Brad Hards <bradh at frogmouth.net>
+
2006-04-23 Thiago Macieira <thiago.macieira@trolltech.com>
* qt/examples/dbus.cpp: Use the new merged-interface mode for
diff --git a/INSTALL b/INSTALL
index 1905ea97..f0b415bb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -72,6 +72,13 @@ Note: Qt 4.1.3 is not available in released form. You need to download
the 4.1.3 snapshots from Trolltech. However, the Qt binding compiles
and works in Qt 4.1.2, but not the dbusidl2cpp tool.
+Note that DBus detects QtCore and QtXml during the configure process
+using pkg-config. You may need to set the PKG_CONFIG_PATH to include
+the Qt4 library directory. If you don't have your Qt4 installed, then
+you may also need to use the --with-qt-moc directive to point to the
+Qt4 moc executable (e.g. $QTDIR/bin/moc).
+
+
Qt 3 Bindings
-------------
diff --git a/README b/README
index a26dbb29..0eb45e3f 100644
--- a/README
+++ b/README
@@ -19,25 +19,42 @@ Configuration flags
These are the dbus-specific configuration flags that can be given to
the ./configure program.
- --enable-qt enable Qt-friendly client library
- --enable-glib enable GLib-friendly client library
- --enable-mono enable mono bindings
- --enable-mono-docs build mono documentation (requires monodoc)
- --enable-tests enable unit test code
- --enable-ansi enable -ansi -pedantic gcc flags
- --enable-verbose-mode support verbose debug mode
- --enable-asserts include assertion checks
- --enable-checks include sanity checks on public API
- --enable-docs build documentation (requires Doxygen and jade)
- --enable-gcov compile with coverage profiling instrumentation (gcc only)
- --enable-python build python bindings (reqires Pyrex >= 0.9)
-
+ --enable-qt enable Qt-friendly client library (note: Qt4)
+ --enable-qt-debug enable Qt-friendly client library, linked to debug
+ Qt libraries
+ --enable-qt3 enable Qt3-friendly client library
+ --enable-glib enable GLib-friendly client library
+ --enable-gtk enable GTK-requiring executables
+ --enable-tests enable unit test code
+ --enable-ansi enable -ansi -pedantic gcc flags
+ --enable-verbose-mode support verbose debug mode
+ --enable-asserts include assertion checks
+ --enable-checks include sanity checks on public API
+ --enable-xml-docs build XML documentation (requires xmlto)
+ --enable-doxygen-docs build DOXYGEN documentation (requires Doxygen)
+ --enable-gcov compile with coverage profiling instrumentation (gcc only)
+ --enable-abstract-sockets
+ use abstract socket namespace (linux only)
+ --enable-gcj build gcj bindings
+ --enable-mono build mono bindings
+ --enable-mono-docs build mono docs
+ --enable-python build python bindings
+ --enable-selinux build with SELinux support
+ --enable-dnotify build with dnotify support (linux only)
+
+ --with-qt-moc=<path> moc for Qt
+ --with-qt3-moc=<path> moc for Qt3
--with-xml=libxml/expat XML library to use
--with-init-scripts=redhat Style of init scripts to install
--with-session-socket-dir=dirname Where to put sockets for the per-login-session message bus
--with-test-socket-dir=dirname Where to put sockets for make check
--with-system-pid-file=pidfile PID file for systemwide daemon
--with-system-socket=filename UNIX domain socket for systemwide daemon
+ --with-console-auth-dir=dirname directory to check for console ownerhip
+ --with-dbus-user=<user> User for running the DBUS daemon (messagebus)
+ --with-gnu-ld assume the C compiler uses GNU ld [default=no]
+ --with-tags[=TAGS] include additional configurations [automatic]
+ --with-x use the X Window System
API/ABI Policy