The other conditionals are using the HAVE_ prefix, using HAVE_GL rather than SUPPORT_GL improves consistency. --- common/Makefile.am | 2 +- m4/spice-deps.m4 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/Makefile.am b/common/Makefile.am index 2be512c..7382509 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -79,7 +79,7 @@ libspice_common_server_la_SOURCES = \ libspice_common_server_la_CFLAGS = -DFIXME_SERVER_SMARTCARD -if SUPPORT_GL +if HAVE_GL libspice_common_la_SOURCES += \ gl_utils.h \ glc.c \ diff --git a/m4/spice-deps.m4 b/m4/spice-deps.m4 index ef9eb8b..83ebb4f 100644 --- a/m4/spice-deps.m4 +++ b/m4/spice-deps.m4 @@ -101,7 +101,7 @@ AC_DEFUN([SPICE_CHECK_OPUS], [ # support, and checks if the needed libraries are available. If found, it will # return the flags to use in the GL_CFLAGS and GL_LIBS variables, and # it will define USE_OPENGL and GL_GLEXT_PROTOTYPES preprocessor symbol as well -# as a SUPPORT_GL Makefile conditional. +# as a HAVE_GL Makefile conditional. # ------------------ AC_DEFUN([SPICE_CHECK_OPENGL], [ AC_ARG_ENABLE([opengl], @@ -109,7 +109,7 @@ AC_DEFUN([SPICE_CHECK_OPENGL], [ [Enable opengl support (not recommended) @<:@default=no@:>@]), [], [enable_opengl="no"]) - AM_CONDITIONAL(SUPPORT_GL, test "x$enable_opengl" = "xyes") + AM_CONDITIONAL(HAVE_GL, test "x$enable_opengl" = "xyes") if test "x$enable_opengl" = "xyes"; then AC_CHECK_LIB(GL, glBlendFunc, GL_LIBS="$GL_LIBS -lGL", enable_opengl=no) -- 2.5.0 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel