[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/gtkglext.m4
From: |
Markus Gothe |
Subject: |
[Gnash-commit] gnash ChangeLog macros/gtkglext.m4 |
Date: |
Mon, 13 Nov 2006 19:55:49 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Markus Gothe <nihilus> 06/11/13 19:55:48
Modified files:
. : ChangeLog
macros : gtkglext.m4
Log message:
Fixed bug #18286.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1609&r2=1.1610
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.31&r2=1.32
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1609
retrieving revision 1.1610
diff -u -b -r1.1609 -r1.1610
--- ChangeLog 13 Nov 2006 17:10:57 -0000 1.1609
+++ ChangeLog 13 Nov 2006 19:55:48 -0000 1.1610
@@ -1,3 +1,7 @@
+2006-11-13 Markus Gothe <address@hidden>
+
+ * macros/gtkglext.m4: Fixed bug #18286.
+
2006-11-13 Patrice Dumas <address@hidden>
* server/: Makefile.am, StreamProvider.cpp, impl.cpp, movie_root.h,
Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- macros/gtkglext.m4 9 Nov 2006 19:19:00 -0000 1.31
+++ macros/gtkglext.m4 13 Nov 2006 19:55:48 -0000 1.32
@@ -17,7 +17,7 @@
dnl
dnl
-dnl: $Id: gtkglext.m4,v 1.31 2006/11/09 19:19:00 nihilus Exp $
+dnl: $Id: gtkglext.m4,v 1.32 2006/11/13 19:55:48 nihilus Exp $
AC_DEFUN([GNASH_PATH_GLEXT],
[
@@ -116,11 +116,13 @@
$PKG_CONFIG --exists gtkglext-1.0 && ac_cv_path_glext_lib=`$PKG_CONFIG
--libs gtkglext-1.0`
fi
+ac_cv_path_glext_incl_config=""
if test x"${ac_cv_path_glext_lib}" = x; then
AC_CHECK_LIB(gtkglext-x11-${gnash_glext_version}, gtk_gl_init,
[ac_cv_path_glext_lib="-lgtkglext-x11-${gnash_glext_version}
-lgdkglext-x11-${gnash_glext_version}"],[
libslist="${prefix}/${target_alias}/lib ${prefix}/lib64 ${prefix}/lib32
${prefix}/lib /opt/local/lib /usr/X11R6/lib64 /usr/X11R6/lib /usr/lib64
/usr/lib32 /usr/lib /sw/lib /opt/local/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
if test -f $i/libgtkglext-x11-${gnash_glext_version}.a -o -f
$i/libgtkglext-x11-${gnash_glext_version}.so; then
+
ac_cv_path_glext_incl_config="-I$i/gtkglext-${gnash_glext_version}/include"
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glext_lib="-L$i
-lgtkglext-x11-${gnash_glext_version} -lgdkglext-x11-${gnash_glext_version}"
break
@@ -141,7 +143,7 @@
if test x"${ac_cv_path_glext_incl}" != x ; then
AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
- GLEXT_CFLAGS="${ac_cv_path_glext_incl}"
+ GLEXT_CFLAGS="${ac_cv_path_glext_incl} ${ac_cv_path_glext_incl_config}"
else
GLEXT_CFLAGS=""
fi
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog macros/gtkglext.m4,
Markus Gothe <=