autoconf updates, several autoconf options have changed how they are run,

please run ./configure --help to see what's what.  Also made --help output
worth looking at.
This commit is contained in:
Joseph Carter 1999-12-30 14:26:53 +00:00
parent ee9f745b14
commit f7cb194142
2 changed files with 202 additions and 243 deletions

400
configure vendored

File diff suppressed because it is too large Load diff

View file

@ -11,26 +11,22 @@ AC_PROG_MAKE_SET
dnl checks for compiler characteristics dnl checks for compiler characteristics
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_ARG_WITH(optimize,
[ --with-optimize Compile with optimization],
RELEASE=$with_optimize
)
AC_ARG_ENABLE(release, AC_ARG_ENABLE(release,
[ --enable-release Compile release (with optimization)], [ --enable-release compile release (with optimization)],
RELEASE=$enable_release RELEASE=$enable_release
) )
AC_SUBST(RELEASE) AC_SUBST(RELEASE)
dnl Checks for OGL support dnl Checks for OGL support
AC_ARG_ENABLE(OpenGLLIB, AC_ARG_WITH(opengl,
[ --enable-OpenGLLIB=DIR Use OpenGL - the libraries are in DIR], [ --with-opengl=DIR use OpenGL with libraries found in DIR],
[HAS_OGL_LIB=yes; OGL_LIB_PATH=$enable_OpenGLLIB; [HAS_OGL_LIB=yes; OGL_LIB_PATH=$enable_OpenGLLIB;
OGL_LDFLAGS=-L$enable_OpenGLLIB]) OGL_LDFLAGS=-L$enable_OpenGLLIB])
AC_SUBST(OGL_LDFLAGS) AC_SUBST(OGL_LDFLAGS)
AC_ARG_ENABLE(OpenGLINC, AC_ARG_WITH(opengl-includes,
[ --enable-OpenGLINC=DIR Use OpenGL - the header files are in DIR], [ --with-opengl-includes=DIR
use OpenGL with header files found in DIR],
HAS_OGL_INC=yes; OGL_INC_PATH=$enable_OpenGLINC; OGL_CFLAGS=-I$enable_OpenGLINC) HAS_OGL_INC=yes; OGL_INC_PATH=$enable_OpenGLINC; OGL_CFLAGS=-I$enable_OpenGLINC)
AC_SUBST(OGL_CFLAGS) AC_SUBST(OGL_CFLAGS)
@ -156,8 +152,8 @@ dnl Checks for GLIDE support
dnl this rule lifted almost wholesale from Mesa dnl this rule lifted almost wholesale from Mesa
GLIDE_CFLAGS="" GLIDE_CFLAGS=""
GLIDE_LDFLAGS="" GLIDE_LDFLAGS=""
AC_ARG_ENABLE(glide, AC_ARG_WITH(glide,
[ --enable-glide=DIR Use glide with header files found in DIR], [ --with-glide=DIR use the GLIDE 2.x SDK found in DIR],
HAS_GLIDE=$withval, HAS_GLIDE=auto HAS_GLIDE=$withval, HAS_GLIDE=auto
) )
if test "x$HAS_GLIDE" != xno; then if test "x$HAS_GLIDE" != xno; then
@ -189,8 +185,8 @@ AC_SUBST(GLIDE_CFLAGS)
AC_SUBST(GLIDE_LDFLAGS) AC_SUBST(GLIDE_LDFLAGS)
TDFXGL_LDFLAGS="" TDFXGL_LDFLAGS=""
AC_ARG_ENABLE(3dfxgl, AC_ARG_WITH(3dfxgl,
[ --enable-3dfxgl=DIR Use lib3dfxgl.so found in DIR], [ --with-3dfxgl=DIR use 3Dfx MiniGL library found in DIR],
HAS_TDFXGL=$withval, HAS_TDFXGL=auto HAS_TDFXGL=$withval, HAS_TDFXGL=auto
) )
if test "x$HAS_TDFXGL" != xno; then if test "x$HAS_TDFXGL" != xno; then
@ -385,28 +381,9 @@ AC_EXEEXT
AC_OBJEXT AC_OBJEXT
AC_PATH_XTRA AC_PATH_XTRA
##########################################################
#
# make Makefile.header, Makefile.tail
#
dnl AC_SUBST_FILE(MAKEFILE_HEADER)
dnl MAKEFILE_HEADER=pre
dnl AC_SUBST_FILE(MAKEFILE_TAIL)
dnl MAKEFILE_TAIL=post
dnl AC_SUBST_FILE(CLIENT_TARGETS)
dnl CLIENT_TARGETS=client
dnl AC_SUBST_FILE(SRCFILES)
dnl SRCFILES=srcfiles
dnl AC_SUBST_FILE(COMP_RULES)
dnl COMP_RULES=rules
########################################################## ##########################################################
# #
# Output files # Output files
# #
AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile) AC_OUTPUT(qw_client/Makefile qw_server/Makefile uquake/Makefile Makefile)