|
From: <br...@us...> - 2008-10-06 06:43:50
|
Revision: 3722
http://openvrml.svn.sourceforge.net/openvrml/?rev=3722&view=rev
Author: braden
Date: 2008-10-06 06:43:48 +0000 (Mon, 06 Oct 2008)
Log Message:
-----------
Updated to 20081006 release of Autoconf GL Macros.
Modified Paths:
--------------
trunk/ChangeLog
trunk/m4/ax_check_gl.m4
Property Changed:
----------------
trunk/
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/0.17:3713,3717,3719
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
+ /branches/0.17:3713,3717,3719,3721
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-10-06 06:27:42 UTC (rev 3721)
+++ trunk/ChangeLog 2008-10-06 06:43:48 UTC (rev 3722)
@@ -1,3 +1,9 @@
+2008-10-06 Braden McDaniel <br...@en...>
+
+ Updated to 20081006 release of Autoconf GL Macros.
+
+ * m4/ax_check_gl.m4
+
2008-10-05 Braden McDaniel <br...@en...>
Updated to 20081005 release of Autoconf GL Macros.
Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4 2008-10-06 06:27:42 UTC (rev 3721)
+++ trunk/m4/ax_check_gl.m4 2008-10-06 06:43:48 UTC (rev 3722)
@@ -10,7 +10,7 @@
dnl "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined. These preprocessor
dnl definitions may not be mutually exclusive.
dnl
-dnl version: 2.1
+dnl version: 2.2
dnl author: Braden McDaniel <br...@en...>
dnl
dnl This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,7 @@
LIBS="${ax_try_lib} ${GL_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
[ax_cv_check_gl_libgl="${ax_try_lib}"; break],
- [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia -lGLcore" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}"
+ [ax_check_gl_nvidia_flags="-L/usr/${ax_check_gl_libdir}/nvidia" LIBS="${ax_try_lib} ${ax_check_gl_nvidia_flags} ${GL_LIBS} ${ax_save_LIBS}"
AC_LINK_IFELSE([AX_CHECK_GL_PROGRAM],
[ax_cv_check_gl_libgl="${ax_try_lib} ${ax_check_gl_nvidia_flags}"; break],
[ax_check_gl_dylib_flag='-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' LIBS="${ax_try_lib} ${ax_check_gl_dylib_flag} ${GL_LIBS} ${ax_save_LIBS}"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|