[Gnash-commit] gnash ChangeLog macros/atk.m4 macros/gtkglext.m...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/08/14 16:49:39

Modified files:
        .              : ChangeLog 
        macros         : atk.m4 gtkglext.m4 opengl.m4 

Log message:
                * macros/atk.m4: Look for atk.h, not atkgl.h.
                * macros/opengl.m4: Put the single tick mark before the rest of
                the statement so it gets expanded correctly.
                * macros/gtkglext.m4: Add -I when --with-opengl-incl is used. 
Also
                set the version when using this option so the other tests still
                work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.638&r2=1.639
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/atk.m4?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.638
retrieving revision 1.639
diff -u -b -r1.638 -r1.639
--- ChangeLog   14 Aug 2006 16:25:14 -0000      1.638
+++ ChangeLog   14 Aug 2006 16:49:38 -0000      1.639
@@ -1,3 +1,12 @@
+2006-08-14  Rob Savoye  <address@hidden>
+
+       * macros/atk.m4: Look for atk.h, not atkgl.h.
+       * macros/opengl.m4: Put the single tick mark before the rest of
+       the statement so it gets expanded correctly.
+       * macros/gtkglext.m4: Add -I when --with-opengl-incl is used. Also
+       set the version when using this option so the other tests still
+       work.
+
 2006-08-14 Tomas Groth Christensen <address@hidden>
 
         * doc/C/internals.xml: Added info about how the soundhandlers works.

Index: macros/atk.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/atk.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/atk.m4       9 Aug 2006 01:59:07 -0000       1.9
+++ macros/atk.m4       14 Aug 2006 16:49:38 -0000      1.10
@@ -41,10 +41,10 @@
   AC_ARG_WITH(atk_incl, [  --with-atk-incl        directory where libatk 
header is], with_atk_incl=${withval})
     AC_CACHE_VAL(ac_cv_path_atk_incl,[
     if test x"${with_atk_incl}" != x ; then
-      if test -f ${with_atk_incl}/atk/atkgl.h ; then
+      if test -f ${with_atk_incl}/atk/atk.h ; then
        ac_cv_path_atk_incl=`(cd ${with_atk_incl}; pwd)`
       else
-       AC_MSG_ERROR([${with_atk_incl} directory doesn't contain atk/atkgl.h])
+       AC_MSG_ERROR([${with_atk_incl} directory doesn't contain atk/atk.h])
       fi
     fi])
 
@@ -77,7 +77,7 @@
 
   dnl If the path hasn't been specified, go look for it.
   if test x"${ac_cv_path_atk_incl}" = x; then
-    AC_CHECK_HEADERS(atk/atkgl.h, [ac_cv_path_atk_incl=""],[
+    AC_CHECK_HEADERS(atk/atk.h, [ac_cv_path_atk_incl=""],[
     if test x"${ac_cv_path_atk_incl}" = x; then
       AC_MSG_CHECKING([for libatk header])
       incllist="/sw/include /usr/local/include /opt/local/include 
/home/latest/include /usr/X11R6/include /opt/include /usr/include 
/usr/pkg/include .. ../.."

Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/gtkglext.m4  13 Aug 2006 15:54:16 -0000      1.19
+++ macros/gtkglext.m4  14 Aug 2006 16:49:39 -0000      1.20
@@ -55,7 +55,7 @@
     AC_CACHE_VAL(ac_cv_path_glext_incl,[
     if test x"${with_glext_incl}" != x ; then
       if test -f ${with_glext_incl}/gtk/gtkgl.h ; then
-       ac_cv_path_glext_incl=`(cd ${with_glext_incl}; pwd)`
+       ac_cv_path_glext_incl="-I`(cd ${with_glext_incl}; pwd)`"
         gnash_glext_topdir=`basename ${with_glext_incl}`
         gnash_glext_version=`echo ${gnash_glext_topdir} | sed -e 
's:gtkglext-::'`
       else
@@ -67,6 +67,7 @@
      if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_glext_incl}" = x; then
        ac_cv_path_glext_incl=`$PKG_CONFIG --cflags gtkglext-1.0`
        gnash_glext_version="1.0"
+       gnash_glext_topdir="gtkglext-${gnash_glext_version}"
        pkg=yes
      fi
 

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- macros/opengl.m4    28 Jul 2006 18:32:25 -0000      1.19
+++ macros/opengl.m4    14 Aug 2006 16:49:39 -0000      1.20
@@ -99,17 +99,16 @@
     AC_CACHE_VAL(ac_cv_path_opengl_lib,[
     if test x"${with_opengl_lib}" != x ; then
       if test -f ${with_opengl_lib}/libGL.a -o -f ${with_opengl_lib}/libGL.so; 
then
-        ac_cv_path_opengl_lib=-L`(cd ${with_opengl_lib}; pwd) -lGL -lGLU`
+        ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd)` -lGL -lGLU"
       else
         if test -f ${with_opengl_lib}/libopengl32.a -o; then
-          ac_cv_path_opengl_lib=-L`(cd ${with_opengl_lib}; pwd) -lopengl32 
-lglu32`
+          ac_cv_path_opengl_lib="-L`(cd ${with_opengl_lib}; pwd) -lopengl32 
-lglu32`"
           AC_MSG_ERROR([${with_opengl_lib} directory doesn't contain libGL.])
         fi
       fi
     fi
     ])
 
-    dnl If the header doesn't exist, there is no point looking for the library.
     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])