projects
/
platform
/
upstream
/
xorg-server.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ead37b0
)
Set GLX automake conditional after we've tested for mesa source and set GLX
author
Alan Coopersmith
<Alan.Coopersmith@sun.com>
Sun, 17 Jul 2005 01:52:33 +0000
(
01:52
+0000)
committer
Alan Coopersmith
<Alan.Coopersmith@sun.com>
Sun, 17 Jul 2005 01:52:33 +0000
(
01:52
+0000)
to "no" if it's --with-mesa-source wasn't set.
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
4ebb894
..
b29c9c3
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-383,7
+383,6
@@
if test "$XCSECURITY" = yes; then
AC_DEFINE(XCSECURITY,1,[Build Security extension])
fi
-AM_CONDITIONAL(GLX, test x$GLX = xyes)
if test "$GLX" = yes -a x$MESA_SOURCE != x; then
AC_DEFINE(GLXEXT,1,[Build GLX extension])
# 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
GLX=no
fi
+AM_CONDITIONAL(GLX, test x$GLX = xyes)
AC_SUBST([MESA_SOURCE])
AM_CONDITIONAL(DRI, test x$DRI = xyes)