From 9def83f7e0795f11201af96cb64b4fb192e721d4 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Fri, 17 Feb 2012 20:51:39 +0000 Subject: XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons Disabled on FreeBSD platforms due to some linking errors. --- extern/CMakeLists.txt | 6 ++++-- extern/SConscript | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'extern') diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 5b2639ecb0d..1d83410a3d7 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -72,6 +72,8 @@ if(WITH_CARVE) add_subdirectory(carve) endif() -if(UNIX AND NOT APPLE) - add_subdirectory(xdnd) +if(WITH_GHOST_XDND) + if(UNIX AND NOT APPLE) + add_subdirectory(xdnd) + endif() endif() diff --git a/extern/SConscript b/extern/SConscript index 5ecf9b1b2af..67b74e9ee91 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -35,5 +35,7 @@ if env['WITH_BF_LIBMV']: if env['WITH_BF_CARVE']: SConscript(['carve/SConscript']) -if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'freebsd7', 'freebsd8', 'freebsd9', 'aix4', 'aix5'): - SConscript(['xdnd/SConscript']) +if env['WITH_GHOST_XDND']: + # FreeBSD doesn't seems to support XDND protocol + if env['OURPLATFORM'] in ('linux', 'openbsd3', 'sunos5', 'aix4', 'aix5'): + SConscript(['xdnd/SConscript']) -- cgit v1.2.3