diff options
author | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-25 20:12:58 +0000 |
commit | 2553bdd7c359cd87525d367761c86932cec5adff (patch) | |
tree | ae71245933c98474a699d3e392de5820879b2018 /xorg-server/config/Makefile.am | |
parent | e2c51f2ee7b0a3ea1a052fc49324057b4a4bbc78 (diff) | |
parent | 4a3dbb926ae3f5410198d7cc4f4ebe4f62eebf05 (diff) | |
download | vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.gz vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.tar.bz2 vcxsrv-2553bdd7c359cd87525d367761c86932cec5adff.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/config/Makefile.am')
-rw-r--r-- | xorg-server/config/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/config/Makefile.am b/xorg-server/config/Makefile.am index 056f30ed0..1e7c501c3 100644 --- a/xorg-server/config/Makefile.am +++ b/xorg-server/config/Makefile.am @@ -3,7 +3,7 @@ AM_CFLAGS = @DIX_CFLAGS@ noinst_LIBRARIES = libconfig.a libconfig_a_SOURCES = config.c config-backends.h -if HAVE_DBUS +if CONFIG_NEED_DBUS AM_CFLAGS += @DBUS_CFLAGS@ libconfig_a_SOURCES += dbus-core.c endif |