From 438924b2ad22f6935514bcd4e15d20e73ab004cb Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 19 Jun 2003 23:29:07 +0000 Subject: [PATCH] remove --enable-gl --- configure.ac | 2 -- m4/gl.m4 | 65 ---------------------------------------------------- 2 files changed, 67 deletions(-) delete mode 100644 m4/gl.m4 diff --git a/configure.ac b/configure.ac index 03343110..5eed9129 100644 --- a/configure.ac +++ b/configure.ac @@ -100,8 +100,6 @@ X11_EXT_VIDMODE X11_EXT_SHAPE X11_EXT_XINERAMA -GL_OPTION - AC_CONFIG_FILES([Makefile po/Makefile.in themes/Makefile diff --git a/m4/gl.m4 b/m4/gl.m4 deleted file mode 100644 index e3592712..00000000 --- a/m4/gl.m4 +++ /dev/null @@ -1,65 +0,0 @@ -# X11_DEVEL() -# -# Check for the presence of the X Window System headers and libraries. -# Sets the CPPFLAGS and LIBS variables as appropriate. -AC_DEFUN([GL_OPTION], -[ - AC_REQUIRE([X11_DEVEL]) - - AC_ARG_ENABLE(gl, [ --enable-gl enable support for OpenGL rendering default=no], - ,[enable_gl="no"]) - - # Store these - OLDLIBS=$LIBS - OLDCPPFLAGS=$CPPFLAGS - - if test "$enable_gl" = "yes"; then - AC_CHECK_LIB([GL], [glXGetConfig], - , - [ - enable_gl="no" - AC_MSG_WARN([Disabling GL rendering support]) - ]) - fi - - if test "$enable_gl" = "yes"; then - CPPFLAGS="$CPPFLAGS $X_CFLAGS" - LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" - - AC_MSG_CHECKING([if we can compile with GL]) - AC_TRY_LINK( - [ - #include - ], - [ - GLfloat f = 0.0; - glVertex3f(f, f, f); - ], - [ - AC_MSG_RESULT([yes]) - ], - [ - AC_MSG_RESULT([no]) - AC_MSG_WARN([Disabling GL rendering support]) - enable_gl="no" - ]) - - GL_CFLAGS="" - GL_LIBS="-lGL" - AC_SUBST(GL_CFLAGS) - AC_SUBST(GL_LIBS) - fi - - CPPFLAGS=$OLDCPPFLAGS - LIBS=$OLDLIBS - - AC_MSG_CHECKING([if GL support is enabled]) - if test "$enable_gl" = "yes"; then - AC_MSG_RESULT([yes]) - - AC_DEFINE(USE_GL) - else - AC_MSG_RESULT([no]) - fi - AM_CONDITIONAL([USE_GL], [test "$enable_gl" = "yes"]) -]) -- 2.39.2