[Gnash-commit] gnash ./ChangeLog macros/glib.m4 macros/gtk2.m4...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/05/12 17:48:40

Modified files:
        .              : ChangeLog 
        macros         : glib.m4 gtk2.m4 gtkglext.m4 

Log message:
        * macros/glib.m4: Look for the internal config file in the lib dir
        in addition to the regular headers.
        * macros/gtk2.m4: Look for the internal config file in the lib dir
        in addition to the regular headers.
        * macros/gtkglext.m4: Look for the internal config file in the lib
        dir in addition to the regular headers.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.309&tr2=1.310&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/glib.m4.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtk2.m4.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/macros/gtkglext.m4.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.309 gnash/ChangeLog:1.310
--- gnash/ChangeLog:1.309       Fri May 12 04:51:33 2006
+++ gnash/ChangeLog     Fri May 12 17:48:40 2006
@@ -1,3 +1,12 @@
+2006-05-12 Rob Savoye <address@hidden>
+
+       * macros/glib.m4: Look for the internal config file in the lib dir
+       in addition to the regular headers.
+       * macros/gtk2.m4: Look for the internal config file in the lib dir
+       in addition to the regular headers.
+       * macros/gtkglext.m4: Look for the internal config file in the lib
+       dir in addition to the regular headers.
+
 2006-05-12 Rob Savoye <address@hidden>
 
        * configure.ac: Print a warning, not an error if Cairo or
Index: gnash/macros/glib.m4
diff -u gnash/macros/glib.m4:1.6 gnash/macros/glib.m4:1.7
--- gnash/macros/glib.m4:1.6    Wed May 10 01:10:06 2006
+++ gnash/macros/glib.m4        Fri May 12 17:48:40 2006
@@ -125,6 +125,9 @@
       AC_MSG_CHECKING([for libglib library])
       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="${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}"
Index: gnash/macros/gtk2.m4
diff -u gnash/macros/gtk2.m4:1.13 gnash/macros/gtk2.m4:1.14
--- gnash/macros/gtk2.m4:1.13   Wed May 10 12:21:52 2006
+++ gnash/macros/gtk2.m4        Fri May 12 17:48:40 2006
@@ -116,6 +116,9 @@
       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"
Index: gnash/macros/gtkglext.m4
diff -u gnash/macros/gtkglext.m4:1.9 gnash/macros/gtkglext.m4:1.10
--- gnash/macros/gtkglext.m4:1.9        Wed May 10 13:14:34 2006
+++ gnash/macros/gtkglext.m4    Fri May 12 17:48:40 2006
@@ -129,6 +129,9 @@
           AC_MSG_CHECKING([for libglext 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/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}"