The following patch try to make sure the default build (./configure)
do not fail to build if OpenGL isn't available, by only enabling the
OpenGL rendrer if it is detected in the default case.
diff --git a/configure.ac b/configure.ac
index 1c10634..82c6e04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -907,10 +907,10 @@ input_events=
dnl By default, we want to to build all renderers
build_ovg=no
build_gles=no
-build_ogl=yes
+build_ogl=auto
build_agg=yes
build_cairo=yes
-renderer_list="OpenGL AGG Cairo"
+renderer_list="AGG Cairo"
nrender=3
AC_ARG_ENABLE(renderer,
AC_HELP_STRING([--enable-renderer=], [Enable support for the specified
renderers (ogl|gles|cairo|agg|all, default=all)]),
@@ -1060,6 +1060,16 @@ if test x$pixelformat = xall; then
fi
fi
+if test x"${build_ogl}" = xyes || test x"${build_ogl}" = xauto; then
+ GNASH_PATH_OPENGL
+ if test xyes = x"${has_opengl}" && test x"${build_ogl}" = xauto; then
+ build_ogl=yes
+ renderer_list="${renderer_list} OpenGL"
+ else
+ build_ogl=no
+ fi
+fi
+
AM_CONDITIONAL(BUILD_OVG_RENDERER, [ test x$build_ovg = xyes ])
AM_CONDITIONAL(BUILD_GLES_RENDERER, [ test x$build_gles = xyes ])
AM_CONDITIONAL(BUILD_OGL_RENDERER, [ test x$build_ogl = xyes])
@@ -2413,10 +2423,6 @@ if test x"${build_ogv}" = xyes; then
GNASH_PKG_FIND(OpenVG, [vg/openvg.h], [OpenVG library], vgDrawImage)
fi
-if test x"${build_ogl}" = xyes; then
- GNASH_PATH_OPENGL
-fi
-
if test x"${build_gtk}" = xyes; then
AC_ARG_ENABLE(ghelp,
AC_HELP_STRING([--enable-ghelp], [Enable support for the GNOME help
system]),
Happy hacking,
--
Petter Reinholdtsen
_______________________________________________
Gnash-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/gnash-dev
