[Gnash-commit] gnash ChangeLog macros/opengl.m4

[Markus Gothe]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Markus Gothe <nihilus>  08/03/21 22:43:01

Modified files:
        .              : ChangeLog 
        macros         : opengl.m4 

Log message:
        Fixed OGL-linking on OS X Leopard.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5991&r2=1.5992
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.38&r2=1.39

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5991
retrieving revision 1.5992
diff -u -b -r1.5991 -r1.5992
--- ChangeLog   21 Mar 2008 21:46:55 -0000      1.5991
+++ ChangeLog   21 Mar 2008 22:43:00 -0000      1.5992
@@ -10,6 +10,7 @@
 2008-03-21 Markus Gothe <address@hidden>
 
        * configure.ac: added tags for HP-UX and IRIX.
+       * macros/opengl.m4: Fixed OGL-linking on OS X Leopard.
        * server/array.cpp: Fix compilation of isfinite.
        * testsuite/server/AsValueTest.cpp: Fix compilation of isfinite.
 

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- macros/opengl.m4    5 Mar 2008 03:55:56 -0000       1.38
+++ macros/opengl.m4    21 Mar 2008 22:43:01 -0000      1.39
@@ -91,7 +91,7 @@
       ac_cv_path_opengl_lib="-framework Carbon -framework ApplicationServices 
-framework OpenGL -framework AGL"
     else
       if test x"${ac_cv_path_opengl_lib}" = x; then
-        newlist="/System/Library/Frameworks/OpenGL.framework/Libraries 
${libslist}"
+        
newlist="/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries 
/System/Library/Frameworks/OpenGL.framework/Libraries ${libslist}"
         for i in $newlist; do
           if test -f $i/libGL.${shlibext} -o -f $i/libGL.a; then
             if test ! x"$i" = x"/usr/lib" -a ! x"$i" = x"/usr/lib64"; then
@@ -131,6 +131,10 @@
       OPENGL_LIBS=""
   fi
 
+  if test x"${darwin}" = xyes; then
+         OPENGL_LIBS="${OPENGL_LIBS} -dylib_file 
/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/Current/Libraries/libGL.dylib"
+  fi
+
   AC_SUBST(OPENGL_CFLAGS)
   AC_SUBST(OPENGL_LIBS)
 ])