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

[build] Use AS_HELP_STRING on all the help strings

Browse source 
Cleans up the inconsistently wrapped lines.
This commit is contained in:
Bill Currie 2021-12-20 14:48:02 +09:00
parent e0863ff067
commit 577959ec6b
25 changed files with 116 additions and 119 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
config.d/asm.m4
View file

@ -5,9 +5,11 @@ case "${host}" in
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_MSG_CHECKING(to see if we should disable asm optimizations) AC_MSG_CHECKING(to see if we should disable asm optimizations)
AC_ARG_ENABLE(asmopt, AC_ARG_ENABLE(asmopt,
[ --disable-asmopt disable assembler optimization], AS_HELP_STRING([--disable-asmopt],
[disable assembler optimization]),
AC_MSG_RESULT(yes), AC_MSG_RESULT(yes),
AC_DEFINE(USE_INTEL_ASM, 1, [Define this if you want to use Intel assembly optimizations]) AC_DEFINE(USE_INTEL_ASM, 1,
[Define this if you want to use Intel assembly optimizations])
ASM_ARCH=yes ASM_ARCH=yes
AC_MSG_RESULT(no) AC_MSG_RESULT(no)
) )
@ -19,6 +21,8 @@ AM_CONDITIONAL(ASM_ARCH, test "x$ASM_ARCH" = "xyes")
AC_MSG_CHECKING(for underscore prefix in names) AC_MSG_CHECKING(for underscore prefix in names)
AC_LINK_IFELSE( AC_LINK_IFELSE(
[AC_LANG_PROGRAM([[asm(".long _bar"); int bar;]], [[]])], [AC_LANG_PROGRAM([[asm(".long _bar"); int bar;]], [[]])],
[AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE, 1, Define this if C symbols are prefixed with an underscore) AC_MSG_RESULT(yes)], [AC_DEFINE(HAVE_SYM_PREFIX_UNDERSCORE, 1,
[Define this if C symbols are prefixed with an underscore])
AC_MSG_RESULT(yes)],
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
]) ])

9
config.d/build_control.m4
View file

@ -4,17 +4,17 @@ dnl ==================================================================
QF_WITH_TARGETS( QF_WITH_TARGETS(
clients, clients,
[ --with-clients=<list> compile clients in <list>:], [compile clients],
[fbdev,sdl,svga,win,x11],dummy [fbdev,sdl,svga,win,x11],dummy
) )
QF_WITH_TARGETS( QF_WITH_TARGETS(
servers, servers,
[ --with-servers=<list> compile dedicated server:], [compile dedicated servers],
[master,nq,qw,qtv],dummy [master,nq,qw,qtv],dummy
) )
QF_WITH_TARGETS( QF_WITH_TARGETS(
tools, tools,
[ --with-tools=<list> compile qf tools:], [compile qf tools],
[bsp2img,carne,gsc,pak,qfbsp,qfcc,qflight,qflmp,qfmodelgen,qfspritegen,qfvis,qwaq,wad,wav],dummy [bsp2img,carne,gsc,pak,qfbsp,qfcc,qflight,qflmp,qfmodelgen,qfspritegen,qfvis,qwaq,wad,wav],dummy
) )
@ -390,7 +390,8 @@ QF_SUBST(PREFER_NON_PIC)
QF_SUBST(STATIC) QF_SUBST(STATIC)
AC_ARG_WITH(static-plugins, AC_ARG_WITH(static-plugins,
[ --with-static-plugins build plugins into executable rather than separate], AS_HELP_STRING([--with-static-plugins],
[build plugins into executable rather than separate]),
static_plugins="$withval", static_plugins=auto) static_plugins="$withval", static_plugins=auto)
if test "x$static_plugins" = xauto; then if test "x$static_plugins" = xauto; then
if test "x$enable_shared" = xno -o "x$SYSTYPE" = xWIN32; then if test "x$enable_shared" = xno -o "x$SYSTYPE" = xWIN32; then

6
config.d/cdrom.m4
View file

@ -4,7 +4,7 @@ dnl ==================================================================
dnl XMMS Checks dnl XMMS Checks
AC_ARG_ENABLE(xmms, AC_ARG_ENABLE(xmms,
[ --enable-xmms enable checking for XMMS], AS_HELP_STRING([--enable-xmms], [enable checking for XMMS])
) )
if test "x$mingw" != xyes -a "x$enable_xmms" == xyes; then if test "x$mingw" != xyes -a "x$enable_xmms" == xyes; then
AM_PATH_XMMS(0.9.5.1, HAVE_XMMS=yes, HAVE_XMMS=no) AM_PATH_XMMS(0.9.5.1, HAVE_XMMS=yes, HAVE_XMMS=no)
@ -78,8 +78,8 @@ AC_SUBST(CD_LIBS)
AC_ARG_WITH([cd-default], AC_ARG_WITH([cd-default],
AS_HELP_STRING([--with-cd-default=...], AS_HELP_STRING([--with-cd-default=...],
[Plugin to use for the default cd driver.] [plugin to use for the default cd driver.]
[Defaults to File.] [Defaults to file.]
[[file linux xmms sdl sgi win32]]), [[file linux xmms sdl sgi win32]]),
[cd_default="$withval"] [cd_default="$withval"]
) )

23
config.d/compiling.m4
View file

@ -53,7 +53,7 @@ if test "x$GCC" = xyes; then
fi fi
AC_ARG_ENABLE(debug, AC_ARG_ENABLE(debug,
[ --disable-debug compile without debugging], AS_HELP_STRING([--disable-debug], [compile without debugging]),
debug=$enable_debug debug=$enable_debug
) )
@ -77,13 +77,15 @@ else
fi fi
AC_ARG_ENABLE(optimize, AC_ARG_ENABLE(optimize,
[ --disable-optimize compile without optimizations (for development)], AS_HELP_STRING([--disable-optimize],
[compile without optimizations (for development)]),
optimize=$enable_optimize, optimize=$enable_optimize,
optimize=yes optimize=yes
) )
AC_ARG_ENABLE(simd, AC_ARG_ENABLE(simd,
[ --enable-simd[=arg] Enable SIMD support (default auto)], AS_HELP_STRING([--enable-simd@<:@=arg@:.@],
[enable SIMD support (default auto)]),
[], [],
[enable_simd=yes] [enable_simd=yes]
) )
@ -123,7 +125,8 @@ if test "x$optimize" = xyes -a "x$leave_cflags_alone" != "xyes"; then
CFLAGS="$saved_cflags" CFLAGS="$saved_cflags"
light="-O2" light="-O2"
AC_ARG_ENABLE(strict-aliasing, AC_ARG_ENABLE(strict-aliasing,
[ --enable-strict-aliasing enable the -fstrict-aliasing option of gcc]) AS_HELP_STRING([--enable-strict-aliasing],
[enable the -fstrict-aliasing option of gcc]))
if test "x$enable_strict_aliasing" = "xyes"; then if test "x$enable_strict_aliasing" = "xyes"; then
heavy="$heavy -fstrict-aliasing" heavy="$heavy -fstrict-aliasing"
light="$light -fstrict-aliasing" light="$light -fstrict-aliasing"
@ -144,7 +147,8 @@ if test "x$optimize" = xyes -a "x$leave_cflags_alone" != "xyes"; then
fi fi
AC_MSG_CHECKING(for special compiler settings) AC_MSG_CHECKING(for special compiler settings)
AC_ARG_WITH(arch, AC_ARG_WITH(arch,
[ --with-arch=ARCH control compiler architecture directly], AS_HELP_STRING([--with-arch=ARCH],
[control compiler architecture directly]),
arch="$withval", arch=auto arch="$withval", arch=auto
) )
case "$arch" in case "$arch" in
@ -195,7 +199,8 @@ fi
dnl CFLAGS for release and devel versions dnl CFLAGS for release and devel versions
AC_ARG_ENABLE(profile, AC_ARG_ENABLE(profile,
[ --enable-profile compile with profiling (for development)], AS_HELP_STRING([--enable-profile],
[compile with profiling (for development)]),
profile=$enable_profile profile=$enable_profile
) )
if test "x$profile" = xyes; then if test "x$profile" = xyes; then
@ -213,7 +218,7 @@ if test "x$GCC" = xyes; then
dnl Check for -pipe vs -save-temps. dnl Check for -pipe vs -save-temps.
AC_MSG_CHECKING(for -pipe vs -save-temps) AC_MSG_CHECKING(for -pipe vs -save-temps)
AC_ARG_ENABLE(save-temps, AC_ARG_ENABLE(save-temps,
[ --enable-save-temps save temporary files], AS_HELP_STRING([--enable-save-temps], [save temporary files]),
AC_MSG_RESULT(-save-temps) AC_MSG_RESULT(-save-temps)
CFLAGS="$CFLAGS -save-temps" CFLAGS="$CFLAGS -save-temps"
BUILD_TYPE="$BUILD_TYPE Save-temps" BUILD_TYPE="$BUILD_TYPE Save-temps"
@ -238,7 +243,7 @@ QF_CC_OPTION(-Wsuggest-attribute=format)
QF_CC_OPTION(-Wformat-nonliteral) QF_CC_OPTION(-Wformat-nonliteral)
AC_ARG_ENABLE(coverage, AC_ARG_ENABLE(coverage,
[ --enable-coverage Enable generation of data for gcov]) AS_HELP_STRING([--enable-coverage], [enable generation of data for gcov]))
if test "x$enable_coverage" = xyes; then if test "x$enable_coverage" = xyes; then
QF_CC_OPTION(-fprofile-arcs -ftest-coverage) QF_CC_OPTION(-fprofile-arcs -ftest-coverage)
fi fi
@ -270,7 +275,7 @@ if test "x$GCC" != xyes; then
fi fi
AC_ARG_ENABLE(Werror, AC_ARG_ENABLE(Werror,
[ --disable-Werror Do not treat warnings as errors]) AS_HELP_STRING([--disable-Werror], [do not treat warnings as errors]))
dnl We want warnings, lots of warnings... dnl We want warnings, lots of warnings...
dnl The help text should be INVERTED before release! dnl The help text should be INVERTED before release!
dnl when in git, this test defaults to ENABLED. dnl when in git, this test defaults to ENABLED.

16
config.d/compression.m4
View file

@ -1,6 +1,4 @@
AC_ARG_ENABLE(flac, AC_ARG_ENABLE(flac, AS_HELP_STRING([--disable-flac], [disable flac support]))
[ --disable-flac disable flac support],
)
HAVE_FLAC=no HAVE_FLAC=no
if test "x$enable_flac" != "xno"; then if test "x$enable_flac" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
@ -15,8 +13,7 @@ fi
AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes") AM_CONDITIONAL(HAVE_FLAC, test "x$HAVE_FLAC" = "xyes")
AC_ARG_ENABLE(wildmidi, AC_ARG_ENABLE(wildmidi,
[ --disable-wildmidi disable libWildMidi support], AS_HELP_STRING([--disable-wildmidi], disable libWildMidi support]))
)
HAVE_WILDMIDI=no HAVE_WILDMIDI=no
WM_LIBS= WM_LIBS=
if test "x$enable_wildmidi" != "xno"; then if test "x$enable_wildmidi" != "xno"; then
@ -33,8 +30,7 @@ AC_SUBST(WM_LIBS)
AM_CONDITIONAL(HAVE_MIDI, test "x$HAVE_WILDMIDI" = "xyes") AM_CONDITIONAL(HAVE_MIDI, test "x$HAVE_WILDMIDI" = "xyes")
AC_ARG_ENABLE(vorbis, AC_ARG_ENABLE(vorbis,
[ --disable-vorbis disable ogg vorbis support], AS_HELP_STRING([--disable-vorbis], [disable ogg vorbis support]))
)
HAVE_VORBIS=no HAVE_VORBIS=no
if test "x$enable_vorbis" != "xno"; then if test "x$enable_vorbis" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
@ -59,7 +55,7 @@ fi
AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBIS" = "xyes") AM_CONDITIONAL(HAVE_VORBIS, test "x$HAVE_VORBIS" = "xyes")
AC_ARG_ENABLE(zlib, [ --disable-zlib disable zlib support]) AC_ARG_ENABLE(zlib, AS_HELP_STRING([--disable-zlib], [disable zlib support]))
HAVE_ZLIB=no HAVE_ZLIB=no
Z_LIBS="" Z_LIBS=""
if test "x$enable_zlib" != "xno"; then if test "x$enable_zlib" != "xno"; then
@ -83,9 +79,7 @@ if test "x$HAVE_ZLIB" = "xyes"; then
AC_DEFINE(HAVE_ZLIB, 1, [Define if you have zlib]) AC_DEFINE(HAVE_ZLIB, 1, [Define if you have zlib])
fi fi
AC_ARG_ENABLE(png, AC_ARG_ENABLE(png, AS_HELP_STRING([--disable-png], [disable png support]))
[ --disable-png disable png support],
)
HAVE_PNG=no HAVE_PNG=no
PNG_LIBS="" PNG_LIBS=""
if test "x$enable_png" != "xno"; then if test "x$enable_png" != "xno"; then

5
config.d/cross_compile.m4
View file

@ -1,8 +1,9 @@
if test "x$cross_compiling" = xyes; then if test "x$cross_compiling" = xyes; then
AC_MSG_CHECKING(whether byte ordering is bigendian) AC_MSG_CHECKING(whether byte ordering is bigendian)
AC_ARG_WITH(endian, AC_ARG_WITH(endian,
[ --with-endian=TYPE set endian of target system for AS_HELP_STRING([--with-endian=TYPE],
cross-compiling. TYPE = little or big.], [set endian of target system for cross-compiling.]
[TYPE = little or big.]),
endian="$withval", endian="$withval",
) )
case "x$endian" in case "x$endian" in

3
config.d/curses.m4
View file

@ -1,6 +1,5 @@
AC_ARG_ENABLE(curses, AC_ARG_ENABLE(curses,
[ --disable-curses disable curses support] AS_HELP_STRING([--disable-curses], [disable curses support]))
)
if test "x$enable_curses" != "xno"; then if test "x$enable_curses" != "xno"; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
PKG_CHECK_MODULES([NCURSES], [ncurses], HAVE_NCURSES=yes, HAVE_NCURSES=no) PKG_CHECK_MODULES([NCURSES], [ncurses], HAVE_NCURSES=yes, HAVE_NCURSES=no)

5
config.d/fbdev.m4
View file

@ -1,7 +1,8 @@
dnl Checks for Linux FBDev support dnl Checks for Linux FBDev support
AC_ARG_WITH(fbdev, AC_ARG_WITH(fbdev,
[ --with-fbdev use Linux framebuffer device], AS_HELP_STRING([--with-fbdev], [use Linux framebuffer device]),
HAVE_FBDEV=$withval, HAVE_FBDEV=no) HAVE_FBDEV=$withval,
HAVE_FBDEV=no)
if test "x$HAVE_FBDEV" != xno; then if test "x$HAVE_FBDEV" != xno; then
dnl We should still be able to compile it even if dnl We should still be able to compile it even if
dnl there is no fbdev support in the running kernel dnl there is no fbdev support in the running kernel

4
config.d/networking.m4
View file

@ -16,8 +16,8 @@ else
fi fi
AC_ARG_WITH(ipv6, AC_ARG_WITH(ipv6,
AS_HELP_STRING([--with-ipv6=DIR], AS_HELP_STRING([--with-ipv6@<:@=DIR@:>@],
[Enable IPv6 support.] [enable IPv6 support.]
[Optional argument specifies location of inet6 libraries.]), [Optional argument specifies location of inet6 libraries.]),
[ [
if test "x$withval" = xno ; then if test "x$withval" = xno ; then

44
config.d/paths.m4
View file

@ -1,9 +1,7 @@
dnl Whether to enable XDG support or not dnl Whether to enable XDG support or not
AC_ARG_ENABLE(xdg, AC_ARG_ENABLE(xdg, AS_HELP_STRING([--enable-xdg], [enable XDG support]),
[ --enable-xdg enable XDG support],
xdg=$enable_xdg, xdg=$enable_xdg,
xdg=no xdg=no)
)
if test "x$xdg" != xno; then if test "x$xdg" != xno; then
HAVE_XDG=yes HAVE_XDG=yes
else else
@ -36,10 +34,10 @@ else
fi fi
AC_ARG_WITH(global-cfg, AC_ARG_WITH(global-cfg,
[ --with-global-cfg=FILE If set will change the name and location of the AS_HELP_STRING([--with-global-cfg=FILE],
global config file used by QuakeForge. Defaults to [if set will change the name and location of the global config file]
/etc/quakeforge.conf.], [used by QuakeForge. Defaults to /etc/quakeforge.conf.]),
globalconf="$withval", globalconf="auto") globalconf="$withval", globalconf="auto")
if test "x$globalconf" = "xauto" || test "x$globalconf" = "xyes" || \ if test "x$globalconf" = "xauto" || test "x$globalconf" = "xyes" || \
test "x$globalconf" = "xno"; then dnl yes/no sanity checks test "x$globalconf" = "xno"; then dnl yes/no sanity checks
globalconf="$default_globalconf" globalconf="$default_globalconf"
@ -47,10 +45,10 @@ fi
AC_DEFINE_UNQUOTED(FS_GLOBALCFG, "$globalconf", [Define this to the location of the global config file]) AC_DEFINE_UNQUOTED(FS_GLOBALCFG, "$globalconf", [Define this to the location of the global config file])
AC_ARG_WITH(user-cfg, AC_ARG_WITH(user-cfg,
[ --with-user-cfg=FILE If set will change the name and location of the AS_HELP_STRING([--with-user-cfg=FILE],
user-specific config file used by QuakeForge. [if set will change the name and location of the user-specific config]
Defaults to ~/.quakeforgerc.], [file used by QuakeForge. Defaults to ~/.quakeforgerc.]),
userconf="$withval", userconf="auto") userconf="$withval", userconf="auto")
if test "x$userconf" = "xauto" || test "x$userconf" = "xyes" || \ if test "x$userconf" = "xauto" || test "x$userconf" = "xyes" || \
test "x$userconf" = "xno"; then dnl yes/no sanity checks test "x$userconf" = "xno"; then dnl yes/no sanity checks
userconf="$default_userconf" userconf="$default_userconf"
@ -58,9 +56,10 @@ fi
AC_DEFINE_UNQUOTED(FS_USERCFG, "$userconf", [Define this to the location of the user config file]) AC_DEFINE_UNQUOTED(FS_USERCFG, "$userconf", [Define this to the location of the user config file])
AC_ARG_WITH(sharepath, AC_ARG_WITH(sharepath,
[ --with-sharepath=DIR Use DIR for shared game data, defaults to AS_HELP_STRING([--with-sharepath=DIR],
'.' or \${datarootdir}/games/quakeforge (if new style)], [use DIR for shared game data, defaults to '.' or]
sharepath=$withval, sharepath="auto") [${datarootdir}/games/quakeforge (if new style)]),
sharepath=$withval, sharepath="auto")
if test "x$sharepath" = "xauto" -o "x$sharepath" = "xyes" -o "x$sharepath" = "x"; then if test "x$sharepath" = "xauto" -o "x$sharepath" = "xyes" -o "x$sharepath" = "x"; then
sharepath="$default_sharepath" sharepath="$default_sharepath"
elif test "x$sharepath" = xno; then elif test "x$sharepath" = xno; then
@ -70,9 +69,10 @@ AC_DEFINE_UNQUOTED(FS_SHAREPATH, "$sharepath", [Define this to the shared game d
QF_SUBST(sharepath) QF_SUBST(sharepath)
AC_ARG_WITH(userpath, AC_ARG_WITH(userpath,
[ --with-userpath=DIR Use DIR for unshared game data, defaults to AS_HELP_STRING([--with-userpath=DIR],
'.' or ~/.quakeforge (if new style)], [use DIR for unshared game data, defaults to '.' or ~/.quakeforge]
userpath=$withval, userpath="auto") [(if new style)]),
userpath=$withval, userpath="auto")
if test "x$userpath" = "xauto" -o "x$userpath" = "xyes" -o "x$userpath" = "x"; then if test "x$userpath" = "xauto" -o "x$userpath" = "xyes" -o "x$userpath" = "x"; then
userpath="$default_userpath" userpath="$default_userpath"
elif test "x$userpath" = xno; then elif test "x$userpath" = xno; then
@ -81,9 +81,9 @@ fi
AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath", [Define this to the unshared game directory root]) AC_DEFINE_UNQUOTED(FS_USERPATH, "$userpath", [Define this to the unshared game directory root])
AC_ARG_WITH(plugin-path, AC_ARG_WITH(plugin-path,
[ --with-plugin-path=DIR Use DIR for loading plugins, defaults to AS_HELP_STRING([--with-plugin-path=DIR],
\${libdir}/quakeforge], [use DIR for loading plugins, defaults to ${libdir}/quakeforge]),
plugindir=$withval, plugindir="auto") plugindir=$withval, plugindir="auto")
PLUGINDIR="\${libdir}/quakeforge/plugins" PLUGINDIR="\${libdir}/quakeforge/plugins"
if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then if test "x$plugindir" = "xauto" -o "x$plugindir" = "xyes" -o "x$plugindir" = "x"; then
@ -112,7 +112,7 @@ AC_DEFINE_UNQUOTED(FS_SHADERPATH, "$expanded_shaderdir", [Define this to the pat
AC_SUBST(plugindir) AC_SUBST(plugindir)
AC_ARG_WITH(gl-driver, AC_ARG_WITH(gl-driver,
[ --with-gl-driver=NAME Name of OpenGL driver DLL/DSO], AS_HELP_STRING([--with-gl-driver=NAME], [name of OpenGL driver DLL/DSO]),
gl_driver=$withval, gl_driver=$withval,
gl_driver=auto gl_driver=auto
) )

5
config.d/qfcc.m4
View file

@ -3,9 +3,8 @@ F77=touch
AC_SUBST(F77) AC_SUBST(F77)
AC_ARG_WITH(cpp, AC_ARG_WITH(cpp,
[ --with-cpp=CPP how qfcc should invoke cpp], AS_HELP_STRING([--with-cpp=CPP], [how qfcc should invoke cpp]),
cpp_name="$withval", cpp_name=auto cpp_name="$withval", cpp_name=auto)
)
if test "x$cpp_name" != xauto; then if test "x$cpp_name" != xauto; then
CPP_NAME="$cpp_name" CPP_NAME="$cpp_name"
else else

10
config.d/sdl.m4
View file

@ -1,7 +1,5 @@
dnl SDL/SDL-GL checks dnl SDL/SDL-GL checks
AC_ARG_ENABLE(sdl, AC_ARG_ENABLE(sdl, AS_HELP_STRING([--enable-sdl], [enable checking for SDL]))
[ --enable-sdl enable checking for SDL],
)
if test "x$enable_sdl" = xyes; then if test "x$enable_sdl" = xyes; then
if test "x$PKG_CONFIG" != "x"; then if test "x$PKG_CONFIG" != "x"; then
@ -24,8 +22,7 @@ fi
dnl SDL-AUDIO checks dnl SDL-AUDIO checks
AC_ARG_ENABLE(sdl-audio, AC_ARG_ENABLE(sdl-audio,
[ --disable-sdl-audio disable checking for SDL-AUDIO], AS_HELP_STRING([ --disable-sdl-audio], [disable checking for SDL-AUDIO]))
)
if test "x$enable_sdl_audio" != xno; then if test "x$enable_sdl_audio" != xno; then
if test "x$HAVE_SDL" = "xyes"; then if test "x$HAVE_SDL" = "xyes"; then
@ -35,8 +32,7 @@ fi
dnl SDL-CD checks dnl SDL-CD checks
AC_ARG_ENABLE(sdl-cd, AC_ARG_ENABLE(sdl-cd,
[ --disable-sdl-cd disable checking for SDL-CD], AS_HELP_STRING([--disable-sdl-cd], [disable checking for SDL-CD]))
)
if test "x$enable_sdl_cd" != xno; then if test "x$enable_sdl_cd" != xno; then
if test "x$HAVE_SDL" = "xyes"; then if test "x$HAVE_SDL" = "xyes"; then
HAVE_SDL_CD=yes HAVE_SDL_CD=yes

14
config.d/sound.m4
View file

@ -2,9 +2,6 @@ dnl ==================================================================
dnl Checks for sound dnl Checks for sound
dnl ================================================================== dnl ==================================================================
dnl AC_ARG_ENABLE(samplerate,
dnl [ --disable-samplerate disable libsamplerate support],
dnl )
HAVE_SAMPLERATE=no HAVE_SAMPLERATE=no
SAMPLERATE_LIBS="" SAMPLERATE_LIBS=""
if test "x$enable_samplerate" != "xno"; then if test "x$enable_samplerate" != "xno"; then
@ -40,16 +37,16 @@ if test "x$enable_sound" != "xno"; then
AC_CHECK_LIB(mme, waveOutOpen, HAVE_LIBMME=yes) AC_CHECK_LIB(mme, waveOutOpen, HAVE_LIBMME=yes)
AC_ARG_ENABLE(alsa, AC_ARG_ENABLE(alsa,
[ --disable-alsa disable checks for ALSA support]) AS_HELP_STRING([--disable-alsa], [disable checks for ALSA support]))
AC_ARG_ENABLE(oss, AC_ARG_ENABLE(oss,
[ --disable-oss disable checks for OSS support]) AS_HELP_STRING([--disable-oss], [disable checks for OSS support]))
AC_ARG_ENABLE(sun, AC_ARG_ENABLE(sun,
[ --disable-sun disable checks for Sun audio support]) AS_HELP_STRING([--disable-sun], [disable checks for Sun audio support]))
AC_ARG_ENABLE(sound, AC_ARG_ENABLE(sound,
[ --disable-sound disable sound outright]) AS_HELP_STRING([--disable-sound], [disable sound outright]))
unset SOUND_TYPES unset SOUND_TYPES
@ -96,8 +93,7 @@ QF_maGiC_VALUE
AC_SUBST(ALSA_LIBS) AC_SUBST(ALSA_LIBS)
AC_ARG_ENABLE(jack, AC_ARG_ENABLE(jack,
[ --disable-jack disable jack support], AS_HELP_STRING([--disable-jack], [disable jack support]))
)
HAVE_JACK=no HAVE_JACK=no
JACK_LIBS="" JACK_LIBS=""
if test "x$enable_jack" != "xno"; then if test "x$enable_jack" != "xno"; then

4
config.d/svga.m4
View file

@ -1,7 +1,7 @@
dnl Checks for SVGALib support dnl Checks for SVGALib support
AC_ARG_WITH(svga, AC_ARG_WITH(svga,
[ --with-svga=DIR use SVGALib found in DIR], AS_HELP_STRING([--with-svga@<:@=DIR@:>@], [use SVGALib found in DIR]),
HAVE_SVGA=$withval, HAVE_SVGA=auto) HAVE_SVGA=$withval, HAVE_SVGA=auto)
if test "x$HAVE_SVGA" != xno -a "x$HAVE_SVGA" != xauto; then if test "x$HAVE_SVGA" != xno -a "x$HAVE_SVGA" != xauto; then
if test "x$HAVE_SVGA" != xauto; then if test "x$HAVE_SVGA" != xauto; then
SVGA_CFLAGS="$SVGA_CFLAGS -I$withval/include" SVGA_CFLAGS="$SVGA_CFLAGS -I$withval/include"

5
config.d/versions.m4
View file

@ -15,8 +15,9 @@ AC_DEFINE_UNQUOTED(QW_VERSION, "$QW_VERSION",
AC_DEFINE_UNQUOTED(QW_QSG_VERSION, "$QW_QSG_VERSION", AC_DEFINE_UNQUOTED(QW_QSG_VERSION, "$QW_QSG_VERSION",
[Define this to the QSG standard version you support in QuakeWorld]) [Define this to the QSG standard version you support in QuakeWorld])
AC_ARG_ENABLE([version-info], AS_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE], AC_ARG_ENABLE([version-info],
[Override the value passed to libtool -version-info.]), AS_HELP_STRING([--enable-version-info=CURRENT:REVISION:AGE],
[override the value passed to libtool -version-info.]),
[], [enable_version_info=1:0:0]) [], [enable_version_info=1:0:0])
QUAKE_LIBRARY_VERSION_INFO=$enable_version_info QUAKE_LIBRARY_VERSION_INFO=$enable_version_info
AC_SUBST([QUAKE_LIBRARY_VERSION_INFO]) AC_SUBST([QUAKE_LIBRARY_VERSION_INFO])

2
config.d/vulkan.m4
View file

@ -1,6 +1,6 @@
dnl Check for vulkan support dnl Check for vulkan support
AC_ARG_ENABLE(vulkan, AC_ARG_ENABLE(vulkan,
[ --disable-vulkan do not use Vulkan], AS_HELP_STRING([--disable-vulkan], [do not use Vulkan]),
HAVE_VULKAN=$enable_vulkan, HAVE_VULKAN=auto) HAVE_VULKAN=$enable_vulkan, HAVE_VULKAN=auto)
if test "x$HAVE_VULKAN" != xno; then if test "x$HAVE_VULKAN" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"

15
config.d/x11.m4
View file

@ -14,7 +14,8 @@ fi
dnl Check for XFree86-VidMode support dnl Check for XFree86-VidMode support
AC_ARG_ENABLE(vidmode, AC_ARG_ENABLE(vidmode,
[ --disable-vidmode do not use XFree86 VidMode extension], AS_HELP_STRING([--disable-vidmode],
[do not use XFree86 VidMode extension]),
HAVE_VIDMODE=$enable_vidmode, HAVE_VIDMODE=auto) HAVE_VIDMODE=$enable_vidmode, HAVE_VIDMODE=auto)
if test "x$HAVE_VIDMODE" != xno; then if test "x$HAVE_VIDMODE" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
@ -35,8 +36,8 @@ AC_SUBST(VIDMODE_LIBS)
dnl Check for XInput2 support dnl Check for XInput2 support
AC_ARG_ENABLE(xi2, AC_ARG_ENABLE(xi2,
[ --disable-xi2 do not use Xorg XInput2 extension], AS_HELP_STRING([--disable-xi2], [do not use Xorg XInput2 extension]),
HAVE_XI2=$enable_xi2, HAVE_XI2=auto) HAVE_XI2=$enable_xi2, HAVE_XI2=auto)
if test "x$HAVE_XI2" != xno; then if test "x$HAVE_XI2" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS"
@ -55,8 +56,8 @@ AC_SUBST(XI2_LIBS)
dnl Check for XInput2 support dnl Check for XInput2 support
AC_ARG_ENABLE(xfixes, AC_ARG_ENABLE(xfixes,
[ --disable-xfixes do not use Xorg Xfixes extension], AS_HELP_STRING([--disable-xfixes], [do not use Xorg Xfixes extension]),
HAVE_XFIXES=$enable_xfixes, HAVE_XFIXES=auto) HAVE_XFIXES=$enable_xfixes, HAVE_XFIXES=auto)
if test "x$HAVE_XFIXES" != xno; then if test "x$HAVE_XFIXES" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS"
@ -75,8 +76,8 @@ AC_SUBST(XFIXES_LIBS)
dnl Check for DGA support dnl Check for DGA support
AC_ARG_ENABLE(dga, AC_ARG_ENABLE(dga,
[ --disable-dga do not use XFree86 DGA extension], AS_HELP_STRING([--disable-dga], [do not use XFree86 DGA extension]),
HAVE_DGA=$enable_dga, HAVE_DGA=auto) HAVE_DGA=$enable_dga, HAVE_DGA=auto)
if test "x$HAVE_DGA" != xno; then if test "x$HAVE_DGA" != xno; then
save_CPPFLAGS="$CPPFLAGS" save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS" CPPFLAGS="$X_CFLAGS $CPPFLAGS"

7
configure.ac
View file

@ -123,8 +123,8 @@ m4_include(config.d/qfcc.m4)
m4_include(config.d/compiling.m4) m4_include(config.d/compiling.m4)
AC_ARG_ENABLE(static-doc, AC_ARG_ENABLE(static-doc,
[ --enable-static-doc Enable generation of doxygen docs for static] AS_HELP_STRING([--enable-static-doc],
[ functions.]) [enable generation of doxygen docs for static functions.]))
STATIC_DOC=NO STATIC_DOC=NO
if test "x$enable_static_doc" = xyes; then if test "x$enable_static_doc" = xyes; then
STATIC_DOC=YES STATIC_DOC=YES
@ -132,7 +132,8 @@ fi
AC_SUBST(STATIC_DOC) AC_SUBST(STATIC_DOC)
AC_ARG_ENABLE(typecheck-progs, AC_ARG_ENABLE(typecheck-progs,
[ --enable-typecheck-progs Enable type checking on progs field access]) AS_HELP_STRING([--enable-typecheck-progs],
[enable type checking on progs field access]))
if test "x$enable_typecheck_progs" = xyes; then if test "x$enable_typecheck_progs" = xyes; then
AC_DEFINE(TYPECHECK_PROGS, 1, [Define this if you want progs typechecking]) AC_DEFINE(TYPECHECK_PROGS, 1, [Define this if you want progs typechecking])
fi fi

8
m4/libFLAC.m4
View file

@ -8,10 +8,10 @@ AC_DEFUN([AM_PATH_LIBFLAC],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
AC_ARG_WITH(libFLAC,[ --with-libFLAC=PFX Prefix where libFLAC is installed (optional)], libFLAC_prefix="$withval", libFLAC_prefix="") AC_ARG_WITH(libFLAC,AS_HELP_STRING([--with-libFLAC=PFX], [prefix where libFLAC is installed (optional)]), libFLAC_prefix="$withval", libFLAC_prefix="")
AC_ARG_WITH(libFLAC-libraries,[ --with-libFLAC-libraries=DIR Directory where libFLAC library is installed (optional)], libFLAC_libraries="$withval", libFLAC_libraries="") AC_ARG_WITH(libFLAC-libraries,AS_HELP_STRING([--with-libFLAC-libraries=DIR], [directory where libFLAC library is installed (optional)]), libFLAC_libraries="$withval", libFLAC_libraries="")
AC_ARG_WITH(libFLAC-includes,[ --with-libFLAC-includes=DIR Directory where libFLAC header files are installed (optional)], libFLAC_includes="$withval", libFLAC_includes="") AC_ARG_WITH(libFLAC-includes,AS_HELP_STRING([--with-libFLAC-includes=DIR], [directory where libFLAC header files are installed (optional)]), libFLAC_includes="$withval", libFLAC_includes="")
AC_ARG_ENABLE(libFLACtest, [ --disable-libFLACtest Do not try to compile and run a test libFLAC program],, enable_libFLACtest=yes) AC_ARG_ENABLE(libFLACtest, AS_HELP_STRING([--disable-libFLACtest], [do not try to compile and run a test libFLAC program]),, enable_libFLACtest=yes)
if test "x$libFLAC_libraries" != "x" ; then if test "x$libFLAC_libraries" != "x" ; then
LIBFLAC_LIBS="-L$libFLAC_libraries" LIBFLAC_LIBS="-L$libFLAC_libraries"

8
m4/libOggFLAC.m4
View file

@ -8,10 +8,10 @@ AC_DEFUN([AM_PATH_LIBOGGFLAC],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
AC_ARG_WITH(libOggFLAC,[ --with-libOggFLAC=PFX Prefix where libOggFLAC is installed (optional)], libOggFLAC_prefix="$withval", libOggFLAC_prefix="") AC_ARG_WITH(libOggFLAC,AS_HELP_STRING([--with-libOggFLAC=PFX], [prefix where libOggFLAC is installed (optional)]), libOggFLAC_prefix="$withval", libOggFLAC_prefix="")
AC_ARG_WITH(libOggFLAC-libraries,[ --with-libOggFLAC-libraries=DIR Directory where libOggFLAC library is installed (optional)], libOggFLAC_libraries="$withval", libOggFLAC_libraries="") AC_ARG_WITH(libOggFLAC-libraries,AS_HELP_STRING([--with-libOggFLAC-libraries=DIR], [directory where libOggFLAC library is installed (optional)]), libOggFLAC_libraries="$withval", libOggFLAC_libraries="")
AC_ARG_WITH(libOggFLAC-includes,[ --with-libOggFLAC-includes=DIR Directory where libOggFLAC header files are installed (optional)], libOggFLAC_includes="$withval", libOggFLAC_includes="") AC_ARG_WITH(libOggFLAC-includes,AS_HELP_STRING([--with-libOggFLAC-includes=DIR], [directory where libOggFLAC header files are installed (optional)]), libOggFLAC_includes="$withval", libOggFLAC_includes="")
AC_ARG_ENABLE(libOggFLACtest, [ --disable-libOggFLACtest Do not try to compile and run a test libOggFLAC program],, enable_libOggFLACtest=yes) AC_ARG_ENABLE(libOggFLACtest, AS_HELP_STRING([--disable-libOggFLACtest] ,[do not try to compile and run a test libOggFLAC program]),, enable_libOggFLACtest=yes)
if test "x$libOggFLAC_libraries" != "x" ; then if test "x$libOggFLAC_libraries" != "x" ; then
LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries" LIBOGGFLAC_LIBS="-L$libOggFLAC_libraries"

8
m4/ogg.m4
View file

@ -9,10 +9,10 @@ AC_DEFUN([XIPH_PATH_OGG],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
AC_ARG_WITH(ogg,[ --with-ogg=PFX Prefix where libogg is installed (optional)], ogg_prefix="$withval", ogg_prefix="") AC_ARG_WITH(ogg,AS_HELP_STRING([--with-ogg=PFX], [prefix where libogg is installed (optional)]), ogg_prefix="$withval", ogg_prefix="")
AC_ARG_WITH(ogg-libraries,[ --with-ogg-libraries=DIR Directory where libogg library is installed (optional)], ogg_libraries="$withval", ogg_libraries="") AC_ARG_WITH(ogg-libraries,AS_HELP_STRING([--with-ogg-libraries=DIR], [directory where libogg library is installed (optional)]), ogg_libraries="$withval", ogg_libraries="")
AC_ARG_WITH(ogg-includes,[ --with-ogg-includes=DIR Directory where libogg header files are installed (optional)], ogg_includes="$withval", ogg_includes="") AC_ARG_WITH(ogg-includes,AS_HELP_STRING([--with-ogg-includes=DIR], [directory where libogg header files are installed (optional)]), ogg_includes="$withval", ogg_includes="")
AC_ARG_ENABLE(oggtest, [ --disable-oggtest Do not try to compile and run a test Ogg program],, enable_oggtest=yes) AC_ARG_ENABLE(oggtest, AS_HELP_STRING([--disable-oggtest], [do not try to compile and run a test Ogg program]),, enable_oggtest=yes)
if test "x$ogg_libraries" != "x" ; then if test "x$ogg_libraries" != "x" ; then
OGG_LIBS="-L$ogg_libraries" OGG_LIBS="-L$ogg_libraries"

6
m4/quakeforge.m4
View file

@ -144,10 +144,8 @@ QF_STATIC_PLUGIN_PROTOS(m4_default($4,$1),[$1],[$2])
QF_STATIC_PLUGIN_LIST(m4_default($4,$1),[$1],[$2])]) QF_STATIC_PLUGIN_LIST(m4_default($4,$1),[$1],[$2])])
AC_DEFUN([QF_WITH_TARGETS], [ AC_DEFUN([QF_WITH_TARGETS], [
AC_ARG_WITH($1, AC_ARG_WITH($1, AS_HELP_STRING([--with-$1=<list>], [$2:] [$3]),
[$2] $1="$withval", $1=all)
[$3], $1="$withval", $1=all
)
if test "x${$1}" = "xall"; then if test "x${$1}" = "xall"; then
for qf_t in `echo '$3' | sed -e "s/,/ /g"`''; do for qf_t in `echo '$3' | sed -e "s/,/ /g"`''; do
eval ENABLE_$1_${qf_t}=yes eval ENABLE_$1_${qf_t}=yes

6
m4/sdl.m4
View file

@ -12,11 +12,11 @@ AC_DEFUN([AM_PATH_SDL],
[dnl [dnl
dnl Get the cflags and libraries from the sdl-config script dnl Get the cflags and libraries from the sdl-config script
dnl dnl
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], AC_ARG_WITH(sdl-prefix,AS_HELP_STRING([--with-sdl-prefix=PFX], [prefix where SDL is installed (optional)]),
sdl_prefix="$withval", sdl_prefix="") sdl_prefix="$withval", sdl_prefix="")
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], AC_ARG_WITH(sdl-exec-prefix,AS_HELP_STRING([--with-sdl-exec-prefix=PFX], [exec prefix where SDL is installed (optional)]),
sdl_exec_prefix="$withval", sdl_exec_prefix="") sdl_exec_prefix="$withval", sdl_exec_prefix="")
AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], AC_ARG_ENABLE(sdltest, AS_HELP_STRING([--disable-sdltest] ,[do not try to compile and run a test SDL program]),
, enable_sdltest=yes) , enable_sdltest=yes)
if test x$sdl_exec_prefix != x ; then if test x$sdl_exec_prefix != x ; then

8
m4/vorbis.m4
View file

@ -10,10 +10,10 @@ AC_DEFUN([XIPH_PATH_VORBIS],
[dnl [dnl
dnl Get the cflags and libraries dnl Get the cflags and libraries
dnl dnl
AC_ARG_WITH(vorbis,[ --with-vorbis=PFX Prefix where libvorbis is installed (optional)], vorbis_prefix="$withval", vorbis_prefix="") AC_ARG_WITH(vorbis,AS_HELP_STRING([--with-vorbis=PFX], [prefix where libvorbis is installed (optional)]), vorbis_prefix="$withval", vorbis_prefix="")
AC_ARG_WITH(vorbis-libraries,[ --with-vorbis-libraries=DIR Directory where libvorbis library is installed (optional)], vorbis_libraries="$withval", vorbis_libraries="") AC_ARG_WITH(vorbis-libraries, AS_HELP_STRING([--with-vorbis-libraries=DIR]. [directory where libvorbis library is installed (optional)]), vorbis_libraries="$withval", vorbis_libraries="")
AC_ARG_WITH(vorbis-includes,[ --with-vorbis-includes=DIR Directory where libvorbis header files are installed (optional)], vorbis_includes="$withval", vorbis_includes="") AC_ARG_WITH(vorbis-includes,AS_HELP_STRING([--with-vorbis-includes=DIR], [directory where libvorbis header files are installed (optional)]), vorbis_includes="$withval", vorbis_includes="")
AC_ARG_ENABLE(vorbistest, [ --disable-vorbistest Do not try to compile and run a test Vorbis program],, enable_vorbistest=yes) AC_ARG_ENABLE(vorbistest, AS_HELP_STRING([--disable-vorbistest], [do not try to compile and run a test Vorbis program]),, enable_vorbistest=yes)
if test "x$vorbis_libraries" != "x" ; then if test "x$vorbis_libraries" != "x" ; then
VORBIS_LIBS="-L$vorbis_libraries" VORBIS_LIBS="-L$vorbis_libraries"

4
m4/xmms.m4
View file

@ -61,9 +61,9 @@ function vercmp(ver1, ver2, ver1arr, ver2arr, \
AC_DEFUN([AM_PATH_XMMS], AC_DEFUN([AM_PATH_XMMS],
[ [
AC_ARG_WITH(xmms-prefix,[ --with-xmms-prefix=PFX Prefix where XMMS is installed (optional)], AC_ARG_WITH(xmms-prefix,AS_HELP_STRING([--with-xmms-prefix=PFX], [prefix where XMMS is installed (optional)]),
xmms_config_prefix="$withval", xmms_config_prefix="") xmms_config_prefix="$withval", xmms_config_prefix="")
AC_ARG_WITH(xmms-exec-prefix,[ --with-xmms-exec-prefix=PFX Exec prefix where XMMS is installed (optional)], AC_ARG_WITH(xmms-exec-prefix,AS_HELP_STRING([--with-xmms-exec-prefix=PFX], [exec prefix where XMMS is installed (optional)]),
xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="") xmms_config_exec_prefix="$withval", xmms_config_exec_prefix="")
if test x$xmms_config_exec_prefix != x; then if test x$xmms_config_exec_prefix != x; then