qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-29 15:23:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix X-detection.

Browse source
This commit is contained in:
Marcus Sundberg 2000-05-17 19:51:02 +00:00
parent 131cd2b99d
commit 1d1726fd46
2 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
configure.in
View file

@ -190,17 +190,11 @@ dnl Checks for X11 and XShm
AC_PATH_XTRA AC_PATH_XTRA
if test "x$no_x" = x; then if test "x$no_x" = x; then
HAVE_X=yes HAVE_X=yes
X_INCLUDES="-I$x_includes"
X_LIBS="-L$x_libraries"
AC_CHECK_LIB(Xext, XShmQueryExtension, [X_SHM_LIB=-lXext], AC_CHECK_LIB(Xext, XShmQueryExtension, [X_SHM_LIB=-lXext],
[HAVE_X="no"], [ $X_LIBS -lX11 $X_EXTRA_LIBS ] [HAVE_X="no"], [ $X_LIBS -lX11 $X_EXTRA_LIBS ]
) )
fi fi
AC_SUBST(HAVE_X)
AC_SUBST(X_INCLUDES)
AC_SUBST(X_LIBS)
AC_SUBST(X_PRE_LIBS)
AC_SUBST(X_SHM_LIB) AC_SUBST(X_SHM_LIB)
dnl Checks for OpenGL support dnl Checks for OpenGL support
@ -306,7 +300,7 @@ AC_SUBST(OPENGL_CFLAGS)
AC_SUBST(OPENGL_INCLUDES) AC_SUBST(OPENGL_INCLUDES)
AC_SUBST(OPENGL_LIBS) AC_SUBST(OPENGL_LIBS)
dnl Set $prefix and $exec_prefix to $ac_default_prefix if they haven't been set dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
test "x$prefix" = xNONE && prefix=$ac_default_prefix test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'

2
source/Makefile.am
View file

@ -1,6 +1,6 @@
## Process this file with automake to produce Makefile.in ## Process this file with automake to produce Makefile.in
INCLUDES= @X_INCLUDES@ @OPENGL_INCLUDES@ -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include @OPENGL_INCLUDES@ $(X_CFLAGS)
bin_PROGRAMS = @TARGETS@ bin_PROGRAMS = @TARGETS@