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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/29 12:58:49

Modified files:
        .              : ChangeLog 
        macros         : gtkglext.m4 

Log message:
        Applied patch by Stefan Schweizer:
        * macros/gtkglext.m4: Fix gnash building with confcache.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.385&tr2=1.386&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.17&tr2=1.18&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.385 gnash/ChangeLog:1.386
--- gnash/ChangeLog:1.385       Mon May 29 12:49:34 2006
+++ gnash/ChangeLog     Mon May 29 12:58:49 2006
@@ -1,3 +1,7 @@
+2006-05-29 Stefan Schweizer <address@hidden>
+
+       * macros/gtkglext.m4: Fix gnash building with confcache.
+
 2006-05-29 Sandro Santilli <address@hidden>
 
        * server/dlist.h, server/dlist.cpp: renamed display_list
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.17 gnash/macros/gtkglext.m4:1.18
--- gnash/macros/gtkglext.m4:1.17       Wed May 24 11:26:04 2006
+++ gnash/macros/gtkglext.m4    Mon May 29 12:58:49 2006
@@ -101,12 +101,12 @@
         for i in $incllist; do
          if test -f $i/gtk/gtkgl.h; then
            if test x"$i" != x"/usr/include"; then
-             ac_cv_path_glext_incl="$i"
+             ac_cv_path_glext_incl="-I$i"
              break
             fi
          else
            if test -f $i/${gnash_glext_topdir}/gtk/gtkgl.h; then
-             ac_cv_path_glext_incl="$i/${gnash_glext_topdir}"
+             ac_cv_path_glext_incl="-I$i/${gnash_glext_topdir}"
              break
            fi
          fi
@@ -169,7 +169,7 @@
     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 .. ../.."
-    ac_cv_path_glext_incl="-I${ac_cv_path_glext_incl}"
+    ac_cv_path_glext_incl="${ac_cv_path_glext_incl}"
     for i in $libslist; do
       if test -f $i/gtkglext-${gnash_glext_version}/include/gdkglext-config.h; 
then
         ac_cv_path_glext_incl="${ac_cv_path_glext_incl} 
-I${i}/gtkglext-${gnash_glext_version}/include"