Mercurial > hg > octave-max

changeset 12166:eceacb78aa7f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't add -L/usr/X11R6/lib to LDFLAGS in check for OpenGL libraries
author John W. Eaton <jwe@octave.org>
date Wed, 26 Jan 2011 15:14:51 -0500
parents d58e936b2511
children ad636c1f353b
files ChangeLog acinclude.m4
diffstat 2 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-26  John W. Eaton  <jwe@octave.org>
+
+	* acinclude.m4 (OPENGL_LIBS): Don't add -L/usr/X11R6/LIB to
+	LDFLAGS in test.  Bug #32160.
+
 2010-01-25  Rik  <octave@nomad.inbox5.com>
 
 	* Makefile.am: Directly run makefile rules in doc/interpreter directory
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -970,7 +970,13 @@
   fi
 ])
 dnl
-dnl Check for OpenGL. If found, define OPENGL_LIBS
+dnl Check for OpenGL.  If found, define OPENGL_LIBS
+dnl
+dnl FIXME -- the following tests should probably check for the
+dnl libraries separately.
+dnl
+dnl FIXME -- should we allow a way to specify a directory for OpenGL
+dnl libraries and header files?
 dnl
 AC_DEFUN([OCTAVE_OPENGL], [
 OPENGL_LIBS=
@@ -1031,10 +1037,7 @@
         fi
         ;;
       *)
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
-        AC_CHECK_LIB(GL, glEnable, OPENGL_LIBS="-L/usr/X11R6/lib -lGL -lGLU")
-        LDFLAGS="$save_LDFLAGS"
+        AC_CHECK_LIB(GL, glEnable, OPENGL_LIBS="-lGL -lGLU")
         ;;
     esac
   fi