[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ./ChangeLog macros/glib.m4 macros/gtk2.m4...
|
From: |
Rob Savoye |
|
Subject: |
[Gnash-commit] gnash ./ChangeLog macros/glib.m4 macros/gtk2.m4... |
|
Date: |
Tue, 16 May 2006 14:00:31 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Branch:
Changes by: Rob Savoye <address@hidden> 06/05/16 14:00:31
Modified files:
. : ChangeLog
macros : glib.m4 gtk2.m4 gtkglext.m4 opengl.m4
Log message:
* macros/glib.m4: Look for the config file the brute force
way.
* macros/gtk2.m4: Look for the config file the brute force
way.
* macros/gtkglext.m4: Look for the config file the brute force
way.
* macros/opengl.m4: Look in /usr/lib*/opengl/xorg-x11/lib for
libGL.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.334&tr2=1.335&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/opengl.m4.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.334 gnash/ChangeLog:1.335
--- gnash/ChangeLog:1.334 Tue May 16 13:56:56 2006
+++ gnash/ChangeLog Tue May 16 14:00:31 2006
@@ -1,3 +1,14 @@
+2006-05-16 Rob Savoye <address@hidden>
+
+ * macros/glib.m4: Look for the config file the brute force
+ way.
+ * macros/gtk2.m4: Look for the config file the brute force
+ way.
+ * macros/gtkglext.m4: Look for the config file the brute force
+ way.
+ * macros/opengl.m4: Look in /usr/lib*/opengl/xorg-x11/lib for
+ libGL.
+
2006-05-16 Sandro Santilli <address@hidden>
* backend/gnash.cpp, server/gnash.h,
Index: gnash/macros/glib.m4
diff -u gnash/macros/glib.m4:1.8 gnash/macros/glib.m4:1.9
--- gnash/macros/glib.m4:1.8 Tue May 16 02:40:24 2006
+++ gnash/macros/glib.m4 Tue May 16 14:00:31 2006
@@ -41,10 +41,10 @@
AC_ARG_WITH(glib_incl, [ --with-glib-incl directory where libglib
header is], with_glib_incl=${withval})
AC_CACHE_VAL(ac_cv_path_glib_incl,[
if test x"${with_glib_incl}" != x ; then
- if test -f ${with_glib_incl}/glib/glibgl.h ; then
+ if test -f ${with_glib_incl}/glib/glib.h ; then
ac_cv_path_glib_incl=`(cd ${with_glib_incl}; pwd)`
else
- AC_MSG_ERROR([${with_glib_incl} directory doesn't contain
glib/glibgl.h])
+ AC_MSG_ERROR([${with_glib_incl} directory doesn't contain glib/glib.h])
fi
fi
])
@@ -98,9 +98,15 @@
fi
if test x"${ac_cv_path_glib_incl}" != x ; then
- libincl=`echo ${ac_cv_path_glib_incl} | sed -e 's/include/lib/'`
- GLIB_CFLAGS="-I${ac_cv_path_glib_incl} -I${libincl}/include"
AC_MSG_RESULT(yes)
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib64 /usr/lib /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/glib-${version}/include/glibconfig.h; then
+ ac_cv_path_glib_incl="-I${ac_cv_path_glib_incl}
-I${i}/glib-${version}/include"
+ break
+ fi
+ done
+ GLIB_CFLAGS="${ac_cv_path_glib_incl}"
else
GLIB_CFLAGS=""
AC_MSG_RESULT(no)
@@ -125,9 +131,6 @@
AC_MSG_CHECKING([for libglib library])
libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
- if test -f $i/glib-${version}/include/glibconfig.h; then
- ac_cv_path_glib_incl="${ac_cv_path_glib_incl}
-I${i}/glib-${version}/include"
- fi
if test -f $i/libglib-${version}.a -o -f $i/libglib-${version}.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glib_lib="-L$i -lglib-${version}"
@@ -154,7 +157,6 @@
fi
fi
-
if test x"${ac_cv_path_glib_lib}" != x ; then
GLIB_LIBS="${ac_cv_path_glib_lib}"
else
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.14 gnash/macros/gtk2.m4:1.15
--- gnash/macros/gtk2.m4:1.14 Fri May 12 17:48:40 2006
+++ gnash/macros/gtk2.m4 Tue May 16 14:00:31 2006
@@ -116,9 +116,6 @@
AC_MSG_CHECKING([for libgtk2 library])
libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
for i in $libslist; do
- if test -f $i/gtk-${version}/include/gdkconfig.h; then
- ac_cv_path_gtk2_incl="${ac_cv_path_gtk2_incl}
-I${i}/gtk-${version}/include"
- fi
if test -f $i/libgtk-x11-2.0.a -o -f $i/libgtk-x11-2.0.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_gtk2_lib="-L$i -lgtk-x11-2.0 -lgdk-x11-2.0"
@@ -149,8 +146,14 @@
if test x"${ac_cv_path_gtk2_incl}" = x"yes"; then
GTK2_CFLAGS=""
else
- libincl=`echo ${ac_cv_path_gtk2_incl} | sed -e 's/include/lib/'`
- GTK2_CFLAGS="-I${ac_cv_path_gtk2_incl} -I${libincl}/include"
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib64 /usr/lib /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/gtk-${version}/include/gdkconfig.h; then
+ ac_cv_path_gtk2_incl="-I${ac_cv_path_gtk2_incl}
-I${i}/gtk-${version}/include"
+
+ fi
+ done
+ GTK2_CFLAGS="${ac_cv_path_gtk2_incl}"
fi
AC_DEFINE([HAVE_GTK2], [1], [Use GTK2 for windowing])
else
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.11 gnash/macros/gtkglext.m4:1.12
--- gnash/macros/gtkglext.m4:1.11 Tue May 16 02:40:24 2006
+++ gnash/macros/gtkglext.m4 Tue May 16 14:00:31 2006
@@ -129,9 +129,6 @@
AC_MSG_CHECKING([for libglext library])
libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64
/usr/X11R6/lib /usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib
/opt/lib /usr/pkg/lib .. ../.."
for i in $libslist; do
- if test -f $i/gtkglext-${version}/include/gdkglext-config.h; then
- ac_cv_path_glext_incl="${ac_cv_path_glext_incl}
-I${i}/gtkglext-${version}/include"
- fi
if test -f $i/libgtkglext-x11-${version}.a -o -f
$i/libgtkglext-x11-${version}.so; then
if test x"$i" != x"/usr/lib"; then
ac_cv_path_glext_lib="-L$i -lgtkglext-x11-${version}
-lgdkglext-x11-${version}"
@@ -158,9 +155,16 @@
fi
if test x"${ac_cv_path_glext_incl}" != x ; then
- libincl=`echo ${ac_cv_path_glext_incl} | sed -e 's/include/lib/'`
- GLEXT_CFLAGS="-I${ac_cv_path_glext_incl} -I${libincl}/include"
AC_DEFINE(HAVE_GTK_GTKGL_H, [1], [GTKGLExt header])
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/lib /usr/lib64 /sw/lib
/usr/local/lib /home/latest/lib /opt/lib /usr/pkg/lib .. ../.."
+
+ libslist="${prefix}/lib64 ${prefix}/lib /usr/X11R6/lib64 /usr/X11R6/lib
/usr/lib /usr/lib64 /sw/lib /usr/local/lib /home/latest/lib /opt/lib
/usr/pkg/lib .. ../.."
+ for i in $libslist; do
+ if test -f $i/gtkglext-${version}/include/gdkglext-config.h; then
+ ac_cv_path_glext_incl="-I${ac_cv_path_glext_incl}
-I${i}/gtkglext-${version}/include"
+ fi
+ done
+ GLEXT_CFLAGS="${ac_cv_path_glext_incl}"
else
GLEXT_CFLAGS=""
fi
Index: gnash/macros/opengl.m4
diff -u gnash/macros/opengl.m4:1.17 gnash/macros/opengl.m4:1.18
--- gnash/macros/opengl.m4:1.17 Mon Apr 24 23:05:55 2006
+++ gnash/macros/opengl.m4 Tue May 16 14:00:31 2006
@@ -110,7 +110,7 @@
if test x"${ac_cv_path_opengl_lib}" = x; then
AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
AC_MSG_CHECKING([for OpenGL library])
- libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib ..
../.."
+ libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib
/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib
/usr/lib64/opengl/xorg-x11/lib64 .. ../.."
for i in $libslist; do
if test -f $i/libGL.a -o -f $i/libGL.so; then
if test x"$i" != x"/usr/lib"; then