Misc. configure cleanups. I'll check for QSG stuff myself.

This commit is contained in:
Jeff Teunissen 2001-02-21 21:13:29 +00:00
parent a3ec4ac781
commit eeabafe9f7
2 changed files with 56 additions and 57 deletions

View file

@ -7,14 +7,17 @@
/* "Proper" package name */
#undef PROGRAM
/* Define this to the QuakeWorld standard version you support */
#undef QW_VERSION
/* Define this to the NetQuake standard version you support */
#undef NQ_VERSION
/* Define this to the QSG standard version you support */
#undef QSG_VERSION
/* Define this to the QSG standard version you support in NetQuake */
#undef NQ_QSG_VERSION
/* Define this to the QuakeWorld standard version you support */
#undef QW_VERSION
/* Define this to the QSG standard version you support in QuakeWorld */
#undef QW_QSG_VERSION
/* Define this to the location of the global config file */
#undef FS_GLOBALCFG
@ -85,14 +88,11 @@
/* Define if you have pthread support. */
#undef HAVE_LIBPTHREAD
/* Define this to something sane if you don't have stricmp */
#undef stricmp
/* If your version of OpenGL uses APIENTRY, define GLAPIENTRY to be APIENTRY */
#undef GLAPIENTRY
/* Define this to something sane if you don't have stricmp */
#undef stricmp
/* Define this if you have fnmatch.h */
#undef HAVE_FNMATCH_H
/* Define this if fnmatch is prototyped in fnmatch.h */
#undef HAVE_FNMATCH_PROTO
@ -103,9 +103,6 @@
/* Define this if you want to have packet logging */
#undef PACKET_LOGGING
/* Define this if you have fnmatch.h */
#undef HAVE_FNMATCH_H
/* Define this if you have FB_AUX_VGA_PLANES_VGA4 */
#undef HAVE_FB_AUX_VGA_PLANES_VGA4

View file

@ -21,17 +21,19 @@ NQ_QSG_VERSION=1.0
QW_VERSION=2.40
QW_QSG_VERSION=2.0
AC_DEFINE_UNQUOTED(PROGRAM, "$PROGRAM")
AC_DEFINE_UNQUOTED(NQ_VERSION, "$NQ_VERSION")
AC_DEFINE_UNQUOTED(QW_VERSION, "$QW_VERSION")
AC_DEFINE_UNQUOTED(QSG_VERSION, "$QSG_VERSION")
AC_DEFINE_UNQUOTED(PROGRAM, "$PROGRAM")
AC_DEFINE_UNQUOTED(NQ_VERSION, "$NQ_VERSION")
AC_DEFINE_UNQUOTED(NQ_QSG_VERSION, "$NQ_QSG_VERSION")
AC_DEFINE_UNQUOTED(QW_VERSION, "$QW_VERSION")
AC_DEFINE_UNQUOTED(QW_QSG_VERSION, "$QW_QSG_VERSION")
AC_SUBST(PROGRAM)
AC_SUBST(NQ_VERSION)
AC_SUBST(NQ_QSG_VERSION)
AC_SUBST(QW_VERSION)
AC_SUBST(QSG_VERSION)
AC_SUBST(QW_QSG_VERSION)
ISODATE=`date +%Y-%m-%d`
ISODATE=$(date +%Y-%m-%d)
AC_SUBST(ISODATE)
AC_LANG_C
@ -69,8 +71,8 @@ if test "$1" = gcc; then
shift
args="$*"
AC_MSG_CHECKING(for fubared gcc)
if test `gcc --version` = 2.96; then
AC_MSG_RESULT(yes. you poor sod. Hope you have egcs)
if test $(gcc --version) = 2.96; then
AC_MSG_RESULT(yes. You poor sod, hope you have egcs)
CC="egcs $args"
set $CPP
shift
@ -88,7 +90,6 @@ AC_SYS_LONG_FILE_NAMES
AC_EXEEXT
AC_OBJEXT
dnl ==================================================================
dnl Checks for header files.
dnl ==================================================================
@ -149,7 +150,7 @@ if test "x$cross_compiling" = xyes; then
exit 1
;;
x*)
AC_MSG_RESULT(unregognized endianess)
AC_MSG_RESULT(unrecognized endianness)
exit 1
;;
esac
@ -157,7 +158,7 @@ else
AC_C_BIGENDIAN
fi
AC_MSG_CHECKING(that fnmatch is in fnmatch.h)
AC_MSG_CHECKING(for fnmatch in fnmatch.h)
AC_TRY_COMPILE(
[#include "fnmatch.h"],
[int (*foo)() = fnmatch;],
@ -311,7 +312,7 @@ fi
AC_ARG_WITH(ipv6,
[ --with-ipv6 enable IPv6 support. Optional argument specifies
[ --with-ipv6[=DIR] enable IPv6 support. Optional argument specifies
location of inet6 libraries.],
if test "x$withval" = xno ; then
NETTYPE_IPV6=no
@ -322,7 +323,7 @@ AC_ARG_WITH(ipv6,
LIBS="$LIBS -L${withval}"
fi
fi
,
,
NETTYPE_IPV6=no
)
AM_CONDITIONAL(NETTYPE_IPV6, test "x$NETTYPE_IPV6" = "xyes")
@ -408,6 +409,7 @@ if test "x$HAVE_FBDEV" != xno; then
dnl there is no fbdev support in the running kernel
AC_CHECK_HEADERS(linux/fb.h fbset.h, HAVE_FBDEV=yes, HAVE_FBDEV=no)
fi
AC_SUBST(HAVE_FBDEV)
if test "x$HAVE_FBDEV" = xyes; then
AC_MSG_CHECKING(for FB_AUX_VGA_PLANES_VGA4)
@ -481,7 +483,7 @@ AC_SUBST(X_SHM_LIB)
dnl Check for XFree86-VidMode support
AC_ARG_ENABLE(vidmode,
[ --enable-vidmode use XFree86 VidMode extension, if available],
HAVE_VIDMODE=$enable_vidmode, HAVE_VIDMODE=auto)
HAVE_VIDMODE=$enable_vidmode, HAVE_VIDMODE=auto)
if test "x$HAVE_VIDMODE" != xno; then
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$X_CFLAGS $CPPFLAGS"
@ -519,9 +521,9 @@ AC_SUBST(DGA_LIBS)
dnl Checks for GLIDE support
AC_ARG_WITH(glide,
[ --with-glide=DIR use the GLIDE 2.x SDK found in DIR],
HAS_GLIDE=$withval, HAS_GLIDE=auto)
if test "x$HAS_GLIDE" != xno; then
if test "x$HAS_GLIDE" != xauto; then
HAVE_GLIDE=$withval, HAVE_GLIDE=auto)
if test "x$HAVE_GLIDE" != xno; then
if test "x$HAVE_GLIDE" != xauto; then
GLIDE_CFLAGS="$GLIDE_CFLAGS -I$withval/include"
GLIDE_LIBS="$GLIDE_LIBS -L$withval/lib"
else
@ -529,9 +531,9 @@ if test "x$HAS_GLIDE" != xno; then
fi
save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $GLIDE_CFLAGS"
AC_CHECK_HEADER(glide.h, HAS_GLIDE=yes, HAS_GLIDE=no)
if test "x$HAS_GLIDE" != xyes; then
HAS_GLIDE=no
AC_CHECK_HEADER(glide.h, HAVE_GLIDE=yes, HAVE_GLIDE=no)
if test "x$HAVE_GLIDE" != xyes; then
HAVE_GLIDE=no
else
AC_DEFINE(HAVE_GLIDE)
fi
@ -655,24 +657,22 @@ AC_SUBST(HAVE_SGL)
TDFXGL_NAME=""
AC_ARG_WITH(3dfx,
[ --with-3dfx support 3Dfx output for the V1/V2, if an argument
is specified it will be used as the GL wrapper lib
for glide.],
[ --with-3dfx[=NAME] support 3Dfx output for the V1/V2. If NAME is
specified, it will be used as the GL wrapper lib
for Glide.]
HAVE_3dfx=$withval, HAVE_3dfx=auto)
HAS_3dfx=$withval, HAS_3dfx=auto)
if test "x$HAS_3dfx" != "xno" -a "x$HAS_SVGA" != "xno" \
-a "x$HAS_GLIDE" != "xno"; then
if test "x$HAS_3dfx" != "xauto" -a "x$HAS_3dfx" != "xyes"; then
TDFXGL_NAME="$HAS_3dfx"
fi
if test -z "$TDFXGL_NAME"; then
dnl Check in reverse order of preference
for a in 3dfxgl $OGL_NAME; do
AC_CHECK_LIB($a, fxMesaCreateContext, TDFXGL_NAME=$a, qwfoo=qwfoo,
[$GLIDE_LIBS $TDFXGL_LIBS])
done
fi
if test "x$HAVE_3dfx" != "xno" -a "x$HAVE_SVGA" != "xno" \
-a "x$HAVE_GLIDE" != "xno"; then
if test "x$HAVE_3dfx" != "xauto" -a "x$HAVE_3dfx" != "xyes"; then
TDFX_NAME="$HAVE_3dfx"
fi
if test -z "$TDFX_NAME"; then
AC_CHECK_LIB($OGL_NAME, fxMesaCreateContext, TDFXGL_NAME=$OGL_NAME,,
[$GLIDE_LIBS $TDFXGL_LIBS])
fi
fi
AC_MSG_CHECKING(for 3Dfx support)
if test -n "$TDFXGL_NAME"; then
TDFXGL_CFLAGS="$GLIDE_CFLAGS"
@ -728,11 +728,11 @@ dnl ==================================================================
dnl Checks for sound
dnl ==================================================================
AC_CHECK_LIB(mme,waveOutOpen,HAVE_LIBMME=yes)
AC_CHECK_LIB(mme, waveOutOpen, HAVE_LIBMME=yes)
AC_ARG_ENABLE(alsa,
[ --disable-alsa disable alsa support],
)
[ --enable-alsa enable checks for ALSA support],
)
SNDTYPE=""
SOUND_LIBS=""
@ -748,7 +748,7 @@ AC_ARG_ENABLE(sdl-audio,
fi
)
if test "x$enable_alsa" != "xno"; then
if test "x$enable_alsa" = "xyes"; then
if test -z "$SNDTYPE" -a "x$ac_cv_header_sys_asoundlib_h" = "xyes"; then
AC_EGREP_CPP([QF_maGiC_VALUE],
[
@ -1038,8 +1038,8 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
if test "x$SYSTYPE" = xWIN32; then
default_globalconf="%WINDIR%/${PACKAGE}.conf"
default_userconf="~/${PACKAGE}.rc"
default_globalconf="~/${PACKAGE}.conf"
default_userconf="~/${PACKAGE}rc"
default_sharepath="."
default_userpath="."
else
@ -1119,11 +1119,13 @@ AC_ARG_ENABLE(optimize,
optimize=$disable_optimize,
optimize=yes
)
AC_ARG_WITH(amd,
[ --with-amd Optimize for AMD processors instead of Intel],
HAVE_AMD="yes",
HAVE_AMD="no"
)
AC_MSG_CHECKING(for optimization)
if test "x$optimize" = xyes; then
AC_MSG_RESULT(yes)
@ -1175,7 +1177,7 @@ AC_ARG_ENABLE(profile,
if test "x$profile" = xyes; then
BUILD_TYPE="$BUILD_TYPE Profile"
if test "x$GCC" = xyes; then
CFLAGS="`echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g'` -pg"
CFLAGS="$(echo $CFLAGS | sed -e 's/-fomit-frame-pointer//g') -pg"
LDFLAGS="$LDFLAGS -pg"
else
CFLAGS="$CFLAGS -p"
@ -1247,7 +1249,7 @@ dnl ==================================================================
AC_MSG_CHECKING(for libz.a in X11)
need_abs_libz=no
for d in `echo $X_LIBS | sed -e 's/-L//'`; do
for d in $(echo $X_LIBS | sed -e 's/-L//'); do
if test -f $d/libz.a; then
need_abs_libz=yes
break