diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | m4/gl.m4 | 65 | ||||
| -rw-r--r-- | openbox/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/keyboard/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/mouse/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/placement/Makefile.am | 2 | ||||
| -rw-r--r-- | render/Makefile.am | 4 |
8 files changed, 74 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index c924986c..811de5de 100644 --- a/configure.ac +++ b/configure.ac @@ -71,6 +71,8 @@ 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 new file mode 100644 index 00000000..e3592712 --- /dev/null +++ b/m4/gl.m4 @@ -0,0 +1,65 @@ +# 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 <GL/gl.h> + ], + [ + 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"]) +]) diff --git a/openbox/Makefile.am b/openbox/Makefile.am index ac277c01..4c83005f 100644 --- a/openbox/Makefile.am +++ b/openbox/Makefile.am @@ -6,7 +6,7 @@ binary=openbox3 url=http://icculus.org/openbox CPPFLAGS=$(X_CFLAGS) $(XFT_CFLAGS) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) \ - $(LIBSN_CFLAGS) @CPPFLAGS@ \ + $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DLOCALEDIR=\"$(localedir)\" \ -DRCDIR=\"$(rcdir)\" \ -DPLUGINDIR=\"$(plugindir)\" \ diff --git a/plugins/Makefile.am b/plugins/Makefile.am index c08300d4..4796307a 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -2,7 +2,7 @@ plugindir=$(libdir)/openbox/plugins SUBDIRS = keyboard mouse placement menu -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DPLUGINDIR=\"$(plugindir)\" INCLUDES=-I.. diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am index c5389c58..ffcd104b 100644 --- a/plugins/keyboard/Makefile.am +++ b/plugins/keyboard/Makefile.am @@ -1,6 +1,6 @@ plugindir=$(libdir)/openbox/plugins -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DG_LOG_DOMAIN=\"Plugin-Keyboard\" INCLUDES=-I../.. diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am index d89fd70e..e4c897d5 100644 --- a/plugins/mouse/Makefile.am +++ b/plugins/mouse/Makefile.am @@ -1,6 +1,6 @@ plugindir=$(libdir)/openbox/plugins -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DG_LOG_DOMAIN=\"Plugin-Mouse\" INCLUDES=-I../.. diff --git a/plugins/placement/Makefile.am b/plugins/placement/Makefile.am index 8942463d..6b328008 100644 --- a/plugins/placement/Makefile.am +++ b/plugins/placement/Makefile.am @@ -1,6 +1,6 @@ plugindir=$(libdir)/openbox/plugins -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DG_LOG_DOMAIN=\"Plugin-Placement\" INCLUDES=-I../.. diff --git a/render/Makefile.am b/render/Makefile.am index dffad8b3..579ff681 100644 --- a/render/Makefile.am +++ b/render/Makefile.am @@ -2,13 +2,13 @@ themedir=$(datadir)/openbox/themes theme=operation -CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) @CPPFLAGS@ \ +CPPFLAGS=$(XFT_CFLAGS) $(GLIB_CFLAGS) $(LIBSN_CFLAGS) $(GL_CFLAGS) @CPPFLAGS@ \ -DG_LOG_DOMAIN=\"Render\" \ -DDEFAULT_THEME=\"$(theme)\" \ -DTHEMEDIR=\"$(themedir)\" INCLUDES=-I.. -LIBS=$(XFT_LIBS) $(GLIB_LIBS) @LIBS@ +LIBS=$(XFT_LIBS) $(GLIB_LIBS) $(GL_LIBS) @LIBS@ noinst_PROGRAMS=rendertest rendertest_LDFLAGS=-lobrender -L. |