qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-17 01:11:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't try to build the console plugins when not building anything that needs them.

Browse source
This commit is contained in:
Bill Currie 2007-06-22 10:27:42 +00:00 committed by Jeff Teunissen
parent ca0bbd909c
commit 2c10c42b23
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
configure.ac
View file

@ -1788,6 +1788,7 @@ if test "x$HAVE_FBDEV" = xyes; then
QF_NEED(vid, [common sw]) QF_NEED(vid, [common sw])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
CAN_BUILD_SW=yes CAN_BUILD_SW=yes
fi fi
@ -1803,6 +1804,7 @@ if test "x$HAVE_X" = xyes; then
QF_NEED(vid, [common gl x11]) QF_NEED(vid, [common gl x11])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
if test "x$ENABLE_clients_x11" = xyes; then if test "x$ENABLE_clients_x11" = xyes; then
QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)" QW_TARGETS="$QW_TARGETS qw-client-x11\$(EXEEXT)"
@ -1813,6 +1815,7 @@ if test "x$HAVE_X" = xyes; then
QF_NEED(vid, [common sw x11]) QF_NEED(vid, [common sw x11])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
fi fi
if test "x$HAVE_MGL" = xyes; then if test "x$HAVE_MGL" = xyes; then
@ -1825,6 +1828,7 @@ if test "x$HAVE_MGL" = xyes; then
QF_NEED(vid, [common sw]) QF_NEED(vid, [common sw])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
CAN_BUILD_SW=yes CAN_BUILD_SW=yes
fi fi
@ -1838,6 +1842,7 @@ if test "x$HAVE_SDL" = xyes; then
QF_NEED(vid, [common sdl sw]) QF_NEED(vid, [common sdl sw])
QF_NEED(qw, [client common sdl]) QF_NEED(qw, [client common sdl])
QF_NEED(nq, [client common sdl]) QF_NEED(nq, [client common sdl])
QF_NEED(console, [client])
fi fi
CAN_BUILD_SW=yes CAN_BUILD_SW=yes
if test "x$ENABLE_clients_sdl32" = xyes; then if test "x$ENABLE_clients_sdl32" = xyes; then
@ -1849,6 +1854,7 @@ if test "x$HAVE_SDL" = xyes; then
QF_NEED(vid, [common sdl sw32]) QF_NEED(vid, [common sdl sw32])
QF_NEED(qw, [client common sdl]) QF_NEED(qw, [client common sdl])
QF_NEED(nq, [client common sdl]) QF_NEED(nq, [client common sdl])
QF_NEED(console, [client])
fi fi
CAN_BUILD_SW32=yes CAN_BUILD_SW32=yes
if test "x$ENABLE_clients_sgl" = xyes; then if test "x$ENABLE_clients_sgl" = xyes; then
@ -1861,6 +1867,7 @@ if test "x$HAVE_SDL" = xyes; then
QF_NEED(vid, [common sdl gl]) QF_NEED(vid, [common sdl gl])
QF_NEED(qw, [client common sdl]) QF_NEED(qw, [client common sdl])
QF_NEED(nq, [client common sdl]) QF_NEED(nq, [client common sdl])
QF_NEED(console, [client])
fi fi
fi fi
if test "x$HAVE_SVGA" = xyes; then if test "x$HAVE_SVGA" = xyes; then
@ -1873,6 +1880,7 @@ if test "x$HAVE_SVGA" = xyes; then
QF_NEED(vid, [asm common svga sw]) QF_NEED(vid, [asm common svga sw])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
CAN_BUILD_SW=yes CAN_BUILD_SW=yes
if test "x$ENABLE_clients_3dfx" = xyes; then if test "x$ENABLE_clients_3dfx" = xyes; then
@ -1884,6 +1892,7 @@ if test "x$HAVE_SVGA" = xyes; then
QF_NEED(vid, [asm common gl svga]) QF_NEED(vid, [asm common gl svga])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
CAN_BUILD_GL=yes CAN_BUILD_GL=yes
fi fi
@ -1897,6 +1906,7 @@ if test "x$mingw" = xyes; then
QF_NEED(vid, [common gl]) QF_NEED(vid, [common gl])
QF_NEED(qw, [client common]) QF_NEED(qw, [client common])
QF_NEED(nq, [client common]) QF_NEED(nq, [client common])
QF_NEED(console, [client])
fi fi
CAN_BUILD_GL=yes CAN_BUILD_GL=yes
fi fi
@ -1906,11 +1916,13 @@ if test "x$ENABLE_servers_nq" = xyes; then
NQ_TARGETS="nq-server\$(EXEEXT) $NQ_TARGETS" NQ_TARGETS="nq-server\$(EXEEXT) $NQ_TARGETS"
SV_TARGETS="$SV_TARGETS nq" SV_TARGETS="$SV_TARGETS nq"
QF_NEED(nq, [common server]) QF_NEED(nq, [common server])
QF_NEED(console, [server])
fi fi
if test "x$ENABLE_servers_qtv" = xyes; then if test "x$ENABLE_servers_qtv" = xyes; then
QTV_TARGETS="qtv\$(EXEEXT) $QTV_TARGETS" QTV_TARGETS="qtv\$(EXEEXT) $QTV_TARGETS"
SV_TARGETS="$SV_TARGETS qtv" SV_TARGETS="$SV_TARGETS qtv"
# QF_NEED(qtv, [common server]) # QF_NEED(qtv, [common server])
QF_NEED(console, [server])
fi fi
if test "x$ENABLE_servers_master" = xyes; then if test "x$ENABLE_servers_master" = xyes; then
HW_TARGETS="hw-master\$(EXEEXT) $HW_TARGETS" HW_TARGETS="hw-master\$(EXEEXT) $HW_TARGETS"
@ -1921,6 +1933,7 @@ if test "x$ENABLE_servers_qw" = xyes; then
QW_TARGETS="qw-server\$(EXEEXT) $QW_TARGETS" QW_TARGETS="qw-server\$(EXEEXT) $QW_TARGETS"
SV_TARGETS="$SV_TARGETS qw" SV_TARGETS="$SV_TARGETS qw"
QF_NEED(qw, [common server]) QF_NEED(qw, [common server])
QF_NEED(console, [server])
fi fi
unset TOOLS_TARGETS unset TOOLS_TARGETS
@ -2085,9 +2098,15 @@ else
fi fi
AC_SUBST(ALSA_PLUGIN) AC_SUBST(ALSA_PLUGIN)
SERVER_PLUGIN_TARGETS="console_server.la" SERVER_PLUGIN_TARGETS=""
if test x$console_need_server = xyes; then
SERVER_PLUGIN_TARGETS="console_server.la"
fi
SERVER_PLUGIN_STATIC="" SERVER_PLUGIN_STATIC=""
CLIENT_PLUGIN_TARGETS="console_client.la" CLIENT_PLUGIN_TARGETS=""
if test x$console_need_client = xyes; then
CLIENT_PLUGIN_TARGETS="console_client.la"
fi
CLIENT_PLUGIN_STATIC="" CLIENT_PLUGIN_STATIC=""
CD_PLUGIN_STATIC="" CD_PLUGIN_STATIC=""
SND_PLUGIN_STATIC="" SND_PLUGIN_STATIC=""