Johannes Sixt | 3 Oct 2011 22:44

Re: [CinCV] Patch:Fixed autodetection of OpenGL in configure

Am 03.10.2011 21:33, schrieb Einar Rünkaru:
> Hi.
> 
> Thank you, testers. Attached fix is created with your help.
> 
> This patch is proposed for 2.2

The following is a useful extension on top of your patch. Otherwise,
with --enable-opengl is reported libGL as "missing".

You can find it as 32d9ceac46 in git://git.cinelerra.org/j6t/cinelerra.git
(branch configure-patch).

--- 8< ---
Subject: [PATCH] List items that were not checked as "not probed" rather than "missing"

When --enable-opengl is used, then libGL is not checked for, and with
the recent commit, it was reported as "missing", even though the OpenGL
component was enabled.
---
 configure.in |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 22ad8cb..832cd34 100644
--- a/configure.in
+++ b/configure.in
 <at>  <at>  -464,6 +464,7  <at>  <at>  if test "x$enable_opengl" = "xauto"; then
 else
 	if test "x$enable_opengl" = "xyes"; then
 		enable_opengl=ok
+		libGL=skip
 		OPENGL_LIBS="-lGLU -lGL"
 		AC_DEFINE(HAVE_GL)
 	fi
 <at>  <at>  -581,7 +582,10  <at>  <at>  AC_OUTPUT(Makefile cinelerra-cvs-current.spec po/Makefile.in \
 					image/Makefile)

 succeeded=yes
-AC_DEFUN([RPT],[if test "x$$1" = "xyes"; then status=found; else status=missing; succeeded=no; fi
+AC_DEFUN([RPT],[if test "x$$1" = "xskip"; then status="not probed"
+elif test "x$$1" = "xyes"; then status=found
+else status=missing; succeeded=no
+fi
 echo "AC_HELP_STRING($2,$status)"])

 echo
--

-- 
1.7.7.95.gf2981

Gmane