frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set GLX automake conditional after we've tested for mesa source and set GLX 

to "no" if it's --with-mesa-source wasn't set.
This commit is contained in:
Alan Coopersmith 2005-07-17 01:52:33 +00:00
parent ead37b0869
commit a6bd7ad985
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -383,7 +383,6 @@ if test "$XCSECURITY" = yes; then
AC_DEFINE(XCSECURITY,1,[Build Security extension]) AC_DEFINE(XCSECURITY,1,[Build Security extension])
fi fi
AM_CONDITIONAL(GLX, test x$GLX = xyes)
if test "$GLX" = yes -a x$MESA_SOURCE != x; then if test "$GLX" = yes -a x$MESA_SOURCE != x; then
AC_DEFINE(GLXEXT,1,[Build GLX extension]) AC_DEFINE(GLXEXT,1,[Build GLX extension])
# EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la' # EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
@ -391,6 +390,7 @@ if test "$GLX" = yes -a x$MESA_SOURCE != x; then
else else
GLX=no GLX=no
fi fi
AM_CONDITIONAL(GLX, test x$GLX = xyes)
AC_SUBST([MESA_SOURCE]) AC_SUBST([MESA_SOURCE])
AM_CONDITIONAL(DRI, test x$DRI = xyes) AM_CONDITIONAL(DRI, test x$DRI = xyes)