svn merge ^/branches/released

2 files changed, 13 insertions, 41 deletions

diff --git a/xorg-server/config/Makefile.in b/xorg-server/config/Makefile.in
index 73ce38585..4bdda21cc 100644
--- a/xorg-server/config/Makefile.in
+++ b/xorg-server/config/Makefile.in
@@ -167,6 +167,7 @@ DGA_LIBS = @DGA_LIBS@
 DIX_CFLAGS = @DIX_CFLAGS@
 DIX_LIB = @DIX_LIB@
 DLLTOOL = @DLLTOOL@
+DLOPEN_LIBS = @DLOPEN_LIBS@
 DMXEXAMPLES_DEP_CFLAGS = @DMXEXAMPLES_DEP_CFLAGS@
 DMXEXAMPLES_DEP_LIBS = @DMXEXAMPLES_DEP_LIBS@
 DMXMODULES_CFLAGS = @DMXMODULES_CFLAGS@
@@ -197,6 +198,13 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 FILE_MAN_DIR = @FILE_MAN_DIR@
 FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
+FONT100DPIDIR = @FONT100DPIDIR@
+FONT75DPIDIR = @FONT75DPIDIR@
+FONTMISCDIR = @FONTMISCDIR@
+FONTOTFDIR = @FONTOTFDIR@
+FONTROOTDIR = @FONTROOTDIR@
+FONTTTFDIR = @FONTTTFDIR@
+FONTTYPE1DIR = @FONTTYPE1DIR@
 GLIB_CFLAGS = @GLIB_CFLAGS@
 GLIB_LIBS = @GLIB_LIBS@
 GLX_ARCH_DEFINES = @GLX_ARCH_DEFINES@
@@ -207,6 +215,7 @@ GREP = @GREP@
 HAL_CFLAGS = @HAL_CFLAGS@
 HAL_LIBS = @HAL_LIBS@
 INSTALL = @INSTALL@
+INSTALL_CMD = @INSTALL_CMD@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -256,6 +265,8 @@ OBJCFLAGS = @OBJCFLAGS@
 OBJCLINK = @OBJCLINK@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
 OS_LIB = @OS_LIB@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
@@ -280,6 +291,8 @@ RAWCPPFLAGS = @RAWCPPFLAGS@
 SED = @SED@
 SERVER_MISC_CONFIG_PATH = @SERVER_MISC_CONFIG_PATH@
 SET_MAKE = @SET_MAKE@
+SHA1_CFLAGS = @SHA1_CFLAGS@
+SHA1_LIBS = @SHA1_LIBS@
 SHELL = @SHELL@
 SOLARIS_ASM_CFLAGS = @SOLARIS_ASM_CFLAGS@
 SOLARIS_INOUT_ARCH = @SOLARIS_INOUT_ARCH@
@@ -370,7 +383,6 @@ build_vendor = @build_vendor@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-distcleancheck_listfiles = @distcleancheck_listfiles@
 docdir = @docdir@
 driverdir = @driverdir@
 dvidir = @dvidir@
diff --git a/xorg-server/config/dbus-api b/xorg-server/config/dbus-api
deleted file mode 100644
index 018e98657..000000000
--- a/xorg-server/config/dbus-api
+++ /dev/null
@@ -1,40 +0,0 @@
-D-BUS Configuration API v2
-----------------------------
-
-The X server will register the bus name org.x.config.displayN, and the 
-object /org/x/config/N, where N is the display number.
-
-Currently only hotplugging of input devices is supported.
-
-org.x.config.input:
-    org.x.config.input.version:
-        Returns one unsigned int32, which is the API version.
-
-    org.x.config.input.add:
-        Takes an argument of key/value option pairs in arrays, e.g.:
-         [ss][ss][ss][ss]
-        is the signature for four options.  These options will be passed
-        to the input driver as with any others.
-        Option names beginning with _ are not allowed; they are reserved
-        for internal use.
-
-        Returns a number of signed int32s.  Positive integers are the
-        device IDs of new devices; negative numbers are X error codes,
-        as defined in X.h.  BadMatch will be returned if the options
-        given do not match any device.  BadValue is returned for a malformed
-        message.  (Example: 8 is new device ID 8; -8 is BadMatch.)
-
-        Notably, BadAlloc is never returned: the server internally signals
-        to D-BUS that the attempt failed for lack of memory.
-
-    org.x.config.input.remove:
-        Takes one uint32 argument, which is the device ID to remove, i.e.:
-         u
-        is the signature.
-
-        Returns one signed int32 which represents an X status as defined in
-        X.h. See org.x.config.input.add. Error codes are negative numbers.
-
-    org.x.config.input.listDevices:
-        Lists the currently active devices. No argument. 
-        Return value is sequence of [<id> <name>] [<id> <name>] ..., i.e. [us].