summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAlan Coopersmith <Alan.Coopersmith@sun.com>2005-07-17 01:52:33 +0000
committerAlan Coopersmith <Alan.Coopersmith@sun.com>2005-07-17 01:52:33 +0000
commita6bd7ad985e138874bb0e1f33f545651dfde32a9 (patch)
treed257c6cf0cb964b59fd4ac36fdb36396a701df2d /configure.ac
parentead37b08699f665a856c7ba29578c27c27db4100 (diff)
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.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 4ebb894be..b29c9c3a8 100644
--- 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)