Commit bb35d196 authored by David Anderson's avatar David Anderson

- Unix build: don't error out if xcb or xcb-atom aren't found;

    just don't build the screensaver

svn path=/trunk/boinc/; revision=22016
parent a65517bf
......@@ -21,8 +21,10 @@ if ENABLE_CLIENT
endif
if ENABLE_MANAGER
# CLIENTGUI_SUBDIRS = clientgui clientgui/res locale clientscr
CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
CLIENTGUI_SUBDIRS = clientgui clientgui/res locale
if BUILD_X11_SCREENSAVER
CLIENTGUI_SUBDIRS += clientscr
endif
endif
# ORDER MATTERS below. One must build dependencies FIRST, then things
......
......@@ -5306,3 +5306,10 @@ David 20 Jul 2010
client/
gui_rpc_server_ops.cpp
cs_notice.cpp
David 20 Jul 2010
- Unix build: don't error out if xcb or xcb-atom aren't found;
just don't build the screensaver
configure.ac
Makefile.am
......@@ -704,12 +704,12 @@ if test "${enable_manager}" = yes ; then
fi
dnl ---------- XCB --------------------------------------------------------
if test "${enable_manager}" = yes ; then
PKG_CHECK_MODULES(XCB, xcb)
PKG_CHECK_MODULES(XCBATOM, xcb-atom)
if test "${enable_manager}" = yes; then
PKG_CHECK_MODULES(XCB,xcb,have_Xcb="yes",echo "WARNING: Xcb not found, x11_screensaver will not be built")
PKG_CHECK_MODULES(XCBATOM,xcb-atom,have_Xcbatom="yes",echo "WARNING: Xcb-atom not found, x11_screensaver will not be built")
fi
dnl --------------------------------------------------------------------------------
AM_CONDITIONAL(BUILD_X11_SCREENSAVER, [ test "$have_Xcb" = yes -a "$have_Xcbatom" = yes ])
dnl -----------------------------------------------------------------------
dnl Heres another way to set up host-specific stuff
AM_CONDITIONAL(OS_DARWIN, [echo $host_os | grep '^darwin' > /dev/null])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment