add --enable-gl support, and put the flags/libs in the appropriate makefiles
authorDana Jansens <danakj@orodu.net>
Fri, 23 May 2003 05:30:00 +0000 (05:30 +0000)
committerDana Jansens <danakj@orodu.net>
Fri, 23 May 2003 05:30:00 +0000 (05:30 +0000)
configure.ac
m4/gl.m4 [new file with mode: 0644]
openbox/Makefile.am
plugins/Makefile.am
plugins/keyboard/Makefile.am
plugins/mouse/Makefile.am
plugins/placement/Makefile.am
render/Makefile.am

index c924986..811de5d 100644 (file)
@@ -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 (file)
index 0000000..e359271
--- /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"])
+])
index ac277c0..4c83005 100644 (file)
@@ -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)\" \
index c08300d..4796307 100644 (file)
@@ -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..
index c5389c5..ffcd104 100644 (file)
@@ -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../..
index d89fd70..e4c897d 100644 (file)
@@ -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../..
index 8942463..6b32800 100644 (file)
@@ -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../..
index dffad8b..579ff68 100644 (file)
@@ -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.