From ad010c889c805d26835cd53e4b051c4f9781ca6b Mon Sep 17 00:00:00 2001
From: Nalin Dahyabhai <nalin@redhat.com>
Date: Apr 01 2010 21:01:29 +0000
Subject: - actually set a value for DBUS_INTROSPECTION_INTERFACE and

  DBUS_INTROSPECTION_METHOD, so that they get preprocessed into man
  pages correctly

---

diff --git a/configure.ac b/configure.ac
index 38e578d..3b0bb8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,6 +36,12 @@ AC_DEFINE_UNQUOTED(ODDJOB_DBUS_MINOR_VERSION,$DBUS_MINOR_VERSION,[Define to the 
 AC_DEFINE_UNQUOTED(ODDJOB_DBUS_MICRO_VERSION,$DBUS_MICRO_VERSION,[Define to the micro version of D-BUS with which oddjob is being compiled.])
 AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE,"Then finish it!",[Define to allow use of DBus development versions.])
 
+DBUS_INTERFACE_DBUS=org.freedesktop.DBus
+DBUS_INTROSPECTION_INTERFACE=${DBUS_INTERFACE_DBUS}.Introspectable
+DBUS_INTROSPECTION_METHOD=Introspect
+AC_SUBST(DBUS_INTROSPECTION_INTERFACE)
+AC_SUBST(DBUS_INTROSPECTION_METHOD)
+
 pam=yes
 AC_CHECK_HEADERS(security/pam_modules.h)
 savedLIBS="$LIBS"
diff --git a/src/oddjob_request.1.in b/src/oddjob_request.1.in
index 849dd7a..ed00726 100644
--- a/src/oddjob_request.1.in
+++ b/src/oddjob_request.1.in
@@ -33,7 +33,9 @@ Invoke a method on the named object instead of \fI@NAMESPACEPATH@/@PACKAGE@\fR.
 The method is part of the named interface instead of \fI@NAMESPACE@.@PACKAGE@\fR.
 .TP
 \fB\-I\fR
-Default to the method and interface names used for D-Bus introspection.
+Default to the method and interface names used for D-Bus introspection
+(\fI@DBUS_INTROSPECTION_METHOD@\fR and \fI@DBUS_INTROSPECTION_INTERFACE@\fR,
+respectively).
 .SH SEE ALSO
 \fBoddjob.conf\fR(5)
 \fBoddjobd.conf\fR(5)
diff --git a/src/oddjobd.conf.5.in b/src/oddjobd.conf.5.in
index b8d2ac0..53e4650 100644
--- a/src/oddjobd.conf.5.in
+++ b/src/oddjobd.conf.5.in
@@ -46,7 +46,7 @@ denied.
 The \fIoddjobd\fR server will automatically supply information used by the
 D-Bus introspection mechanism on behalf of your objects, but only if the
 client which is requesting the information is allowed to invoke the
-\fI@DBUS_INTROSPECTION_METHOD@\R method of the
+\fI@DBUS_INTROSPECTION_METHOD@\fR method of the
 \fI@DBUS_INTROSPECTION_INTERFACE@\fR interface provided by the object.
 
 The configuration file may also indicate that the contents of other files